diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/spinlock_types.h | 4 | ||||
-rw-r--r-- | include/linux/spinlock_types_up.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h index d4af2d7a86ea..7dadce303ebf 100644 --- a/include/linux/spinlock_types.h +++ b/include/linux/spinlock_types.h | |||
@@ -43,14 +43,14 @@ typedef struct { | |||
43 | 43 | ||
44 | #ifdef CONFIG_DEBUG_SPINLOCK | 44 | #ifdef CONFIG_DEBUG_SPINLOCK |
45 | # define __SPIN_LOCK_UNLOCKED(lockname) \ | 45 | # define __SPIN_LOCK_UNLOCKED(lockname) \ |
46 | (spinlock_t) { .raw_lock = __RAW_SPIN_LOCK_UNLOCKED, \ | 46 | (spinlock_t) { .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ |
47 | .magic = SPINLOCK_MAGIC, \ | 47 | .magic = SPINLOCK_MAGIC, \ |
48 | .owner = SPINLOCK_OWNER_INIT, \ | 48 | .owner = SPINLOCK_OWNER_INIT, \ |
49 | .owner_cpu = -1, \ | 49 | .owner_cpu = -1, \ |
50 | SPIN_DEP_MAP_INIT(lockname) } | 50 | SPIN_DEP_MAP_INIT(lockname) } |
51 | #else | 51 | #else |
52 | # define __SPIN_LOCK_UNLOCKED(lockname) \ | 52 | # define __SPIN_LOCK_UNLOCKED(lockname) \ |
53 | (spinlock_t) { .raw_lock = __RAW_SPIN_LOCK_UNLOCKED, \ | 53 | (spinlock_t) { .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ |
54 | SPIN_DEP_MAP_INIT(lockname) } | 54 | SPIN_DEP_MAP_INIT(lockname) } |
55 | #endif | 55 | #endif |
56 | 56 | ||
diff --git a/include/linux/spinlock_types_up.h b/include/linux/spinlock_types_up.h index 34d36691c4ec..10db021f4875 100644 --- a/include/linux/spinlock_types_up.h +++ b/include/linux/spinlock_types_up.h | |||
@@ -18,13 +18,13 @@ typedef struct { | |||
18 | volatile unsigned int slock; | 18 | volatile unsigned int slock; |
19 | } arch_spinlock_t; | 19 | } arch_spinlock_t; |
20 | 20 | ||
21 | #define __RAW_SPIN_LOCK_UNLOCKED { 1 } | 21 | #define __ARCH_SPIN_LOCK_UNLOCKED { 1 } |
22 | 22 | ||
23 | #else | 23 | #else |
24 | 24 | ||
25 | typedef struct { } arch_spinlock_t; | 25 | typedef struct { } arch_spinlock_t; |
26 | 26 | ||
27 | #define __RAW_SPIN_LOCK_UNLOCKED { } | 27 | #define __ARCH_SPIN_LOCK_UNLOCKED { } |
28 | 28 | ||
29 | #endif | 29 | #endif |
30 | 30 | ||