From 2aae0043bf97acfb83c4cbc5c8c2a0744322c00b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sun, 24 Apr 2005 21:04:02 -0700
Subject: [PATCH] --- yaml --- r: 424 b: refs/heads/master c:
 9a59c1860d01b3dea9ab01d5cefb9d5c52042e6d h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-sparc64/spinlock.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad17f8f828d1..317c69718542 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24dc6ead53f8fcae4b1908c4ea3fea75ee844a6d
+refs/heads/master: 9a59c1860d01b3dea9ab01d5cefb9d5c52042e6d
diff --git a/trunk/include/asm-sparc64/spinlock.h b/trunk/include/asm-sparc64/spinlock.h
index d1f91a4f24ae..db7581bdb531 100644
--- a/trunk/include/asm-sparc64/spinlock.h
+++ b/trunk/include/asm-sparc64/spinlock.h
@@ -44,7 +44,7 @@ typedef struct {
 
 #define spin_unlock_wait(lp)	\
 do {	membar("#LoadLoad");	\
-} while(lp->lock)
+} while((lp)->lock)
 
 static inline void _raw_spin_lock(spinlock_t *lock)
 {
@@ -149,7 +149,7 @@ typedef struct {
 	unsigned int break_lock;
 #endif
 } rwlock_t;
-#define RW_LOCK_UNLOCKED	{0,}
+#define RW_LOCK_UNLOCKED	(rwlock_t) {0,}
 #define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
 
 static void inline __read_lock(rwlock_t *lock)