diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-04-25 00:04:02 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-04-25 00:04:02 -0400 |
commit | 9a59c1860d01b3dea9ab01d5cefb9d5c52042e6d (patch) | |
tree | be41af760482e2bc17e23d465edd0f98adc8d464 /include/asm-sparc64 | |
parent | 24dc6ead53f8fcae4b1908c4ea3fea75ee844a6d (diff) |
[SPARC64]: Fix SMP build.
Kill build failures in the SMP+!PREEMPT case introduced
by Al Viro's spinlock.h changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/spinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h index d1f91a4f24ae..db7581bdb531 100644 --- a/include/asm-sparc64/spinlock.h +++ b/include/asm-sparc64/spinlock.h | |||
@@ -44,7 +44,7 @@ typedef struct { | |||
44 | 44 | ||
45 | #define spin_unlock_wait(lp) \ | 45 | #define spin_unlock_wait(lp) \ |
46 | do { membar("#LoadLoad"); \ | 46 | do { membar("#LoadLoad"); \ |
47 | } while(lp->lock) | 47 | } while((lp)->lock) |
48 | 48 | ||
49 | static inline void _raw_spin_lock(spinlock_t *lock) | 49 | static inline void _raw_spin_lock(spinlock_t *lock) |
50 | { | 50 | { |
@@ -149,7 +149,7 @@ typedef struct { | |||
149 | unsigned int break_lock; | 149 | unsigned int break_lock; |
150 | #endif | 150 | #endif |
151 | } rwlock_t; | 151 | } rwlock_t; |
152 | #define RW_LOCK_UNLOCKED {0,} | 152 | #define RW_LOCK_UNLOCKED (rwlock_t) {0,} |
153 | #define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0) | 153 | #define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0) |
154 | 154 | ||
155 | static void inline __read_lock(rwlock_t *lock) | 155 | static void inline __read_lock(rwlock_t *lock) |