From: Andrew Morton <akpm@osdl.org>

David changed all his memory barriers.   I hope we got all this stuff right ;)

Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-sparc64/spinlock.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN include/asm-sparc64/spinlock.h~spinlock-consolidation-sparc64-fix include/asm-sparc64/spinlock.h
--- devel/include/asm-sparc64/spinlock.h~spinlock-consolidation-sparc64-fix	2005-09-07 13:24:00.000000000 -0700
+++ devel-akpm/include/asm-sparc64/spinlock.h	2005-09-07 13:39:52.000000000 -0700
@@ -32,7 +32,7 @@
 #define __raw_spin_is_locked(lp)	((lp)->lock != 0)
 
 #define __raw_spin_unlock_wait(lp)	\
-	do {	membar("#LoadLoad");	\
+	do {	rmb();			\
 	} while((lp)->lock)
 
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
_