From 867e64a61216332b7d7b040f6573be0054cf43b8 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@freescale.com>
Date: Thu, 22 Sep 2005 10:13:31 -0500
Subject: [PATCH] --- yaml --- r: 11454 b: refs/heads/master c:
 3efc333e7fdb6fab9d4eae129e2b249c6483b250 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-ppc/spinlock.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2e569e8d8ef2..f764b6787ed8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b671ad2befe37131af380183760862d5cbad858d
+refs/heads/master: 3efc333e7fdb6fab9d4eae129e2b249c6483b250
diff --git a/trunk/include/asm-ppc/spinlock.h b/trunk/include/asm-ppc/spinlock.h
index 20edcf2a6e0c..5c64b75f0295 100644
--- a/trunk/include/asm-ppc/spinlock.h
+++ b/trunk/include/asm-ppc/spinlock.h
@@ -9,7 +9,7 @@
  * (the type definitions are in asm/raw_spinlock_types.h)
  */
 
-#define __raw_spin_is_locked(x)		((x)->lock != 0)
+#define __raw_spin_is_locked(x)		((x)->slock != 0)
 #define __raw_spin_unlock_wait(lock) \
 	do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
@@ -31,17 +31,17 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
 	bne-	2b\n\
 	isync"
 	: "=&r"(tmp)
-	: "r"(&lock->lock), "r"(1)
+	: "r"(&lock->slock), "r"(1)
 	: "cr0", "memory");
 }
 
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
 	__asm__ __volatile__("eieio	# __raw_spin_unlock": : :"memory");
-	lock->lock = 0;
+	lock->slock = 0;
 }
 
-#define __raw_spin_trylock(l) (!test_and_set_bit(0,&(l)->lock))
+#define __raw_spin_trylock(l) (!test_and_set_bit(0,(volatile unsigned long *)(&(l)->slock)))
 
 /*
  * Read-write spinlocks, allowing multiple readers