Skip to content

Commit 3724c3a

Browse files
author
Sebastian Andrzej Siewior
committed
locking: don't check for __LINUX_SPINLOCK_TYPES_H on -RT archs
Upstream uses arch_spinlock_t within spinlock_t and requests that spinlock_types.h header file is included first. On -RT we have the rt_mutex with its raw_lock wait_lock which needs architectures' spinlock_types.h header file for its definition. However we need rt_mutex first because it is used to build the spinlock_t so that check does not work for us. Therefore I am dropping that check. Signed-off-by: Sebastian Andrzej Siewior <[email protected]>
1 parent 66de899 commit 3724c3a

File tree

15 files changed

+0
-60
lines changed

15 files changed

+0
-60
lines changed

‎arch/alpha/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ALPHA_SPINLOCK_TYPES_H
33
#define _ALPHA_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int lock;
117
} arch_spinlock_t;

‎arch/arm/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef __ASM_SPINLOCK_TYPES_H
33
#define __ASM_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
#define TICKET_SHIFT 16
106

117
typedef struct {

‎arch/arm64/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
#ifndef __ASM_SPINLOCK_TYPES_H
1717
#define __ASM_SPINLOCK_TYPES_H
1818

19-
#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H)
20-
# error "please don't include this file directly"
21-
#endif
22-
2319
#include <linux/types.h>
2420

2521
#define TICKET_SHIFT 16

‎arch/blackfin/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#ifndef __ASM_SPINLOCK_TYPES_H
88
#define __ASM_SPINLOCK_TYPES_H
99

10-
#ifndef __LINUX_SPINLOCK_TYPES_H
11-
# error "please don't include this file directly"
12-
#endif
13-
1410
#include <asm/rwlock.h>
1511

1612
typedef struct {

‎arch/hexagon/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
#ifndef _ASM_SPINLOCK_TYPES_H
2222
#define _ASM_SPINLOCK_TYPES_H
2323

24-
#ifndef __LINUX_SPINLOCK_TYPES_H
25-
# error "please don't include this file directly"
26-
#endif
27-
2824
typedef struct {
2925
volatile unsigned int lock;
3026
} arch_spinlock_t;

‎arch/ia64/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ASM_IA64_SPINLOCK_TYPES_H
33
#define _ASM_IA64_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int lock;
117
} arch_spinlock_t;

‎arch/m32r/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ASM_M32R_SPINLOCK_TYPES_H
33
#define _ASM_M32R_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile int slock;
117
} arch_spinlock_t;

‎arch/metag/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ASM_METAG_SPINLOCK_TYPES_H
33
#define _ASM_METAG_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int lock;
117
} arch_spinlock_t;

‎arch/mn10300/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ASM_SPINLOCK_TYPES_H
33
#define _ASM_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct arch_spinlock {
106
unsigned int slock;
117
} arch_spinlock_t;

‎arch/powerpc/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ASM_POWERPC_SPINLOCK_TYPES_H
33
#define _ASM_POWERPC_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int slock;
117
} arch_spinlock_t;

‎arch/s390/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef __ASM_SPINLOCK_TYPES_H
33
#define __ASM_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
int lock;
117
} __attribute__ ((aligned (4))) arch_spinlock_t;

‎arch/sh/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef __ASM_SH_SPINLOCK_TYPES_H
33
#define __ASM_SH_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int lock;
117
} arch_spinlock_t;

‎arch/tile/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#ifndef _ASM_TILE_SPINLOCK_TYPES_H
1616
#define _ASM_TILE_SPINLOCK_TYPES_H
1717

18-
#ifndef __LINUX_SPINLOCK_TYPES_H
19-
# error "please don't include this file directly"
20-
#endif
21-
2218
#ifdef __tilegx__
2319

2420
/* Low 15 bits are "next"; high 15 bits are "current". */

‎arch/xtensa/include/asm/spinlock_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef __ASM_SPINLOCK_TYPES_H
33
#define __ASM_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
6-
# error "please don't include this file directly"
7-
#endif
8-
95
typedef struct {
106
volatile unsigned int slock;
117
} arch_spinlock_t;

‎include/linux/spinlock_types_up.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#ifndef __LINUX_SPINLOCK_TYPES_UP_H
22
#define __LINUX_SPINLOCK_TYPES_UP_H
33

4-
#ifndef __LINUX_SPINLOCK_TYPES_H
5-
# error "please don't include this file directly"
6-
#endif
7-
84
/*
95
* include/linux/spinlock_types_up.h - spinlock type definitions for UP
106
*

0 commit comments

Comments
 (0)