patch-2.4.0-test9 linux/include/asm-alpha/spinlock.h

• Lines: 75
• Date: Fri Sep 22 14:07:43 2000
• Orig file: v2.4.0-test8/linux/include/asm-alpha/spinlock.h
• Orig date: Thu Feb 24 22:36:05 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-alpha/spinlock.h linux/include/asm-alpha/spinlock.h
@@ -5,8 +5,8 @@
 #include <linux/kernel.h>
 #include <asm/current.h>
 
-#define DEBUG_SPINLOCK 1
-#define DEBUG_RWLOCK 1
+#define DEBUG_SPINLOCK 0
+#define DEBUG_RWLOCK 0
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's
@@ -38,9 +38,6 @@
 #define spin_is_locked(x)	((x)->lock != 0)
 #define spin_unlock_wait(x)	({ do { barrier(); } while ((x)->lock); })
 
-typedef struct { unsigned long a[100]; } __dummy_lock_t;
-#define __dummy_lock(lock) (*(__dummy_lock_t *)(lock))
-
 #if DEBUG_SPINLOCK
 extern void spin_unlock(spinlock_t * lock);
 extern void debug_spin_lock(spinlock_t * lock, const char *, int);
@@ -83,8 +80,8 @@
 	"	blbs	%0,2b\n"
 	"	br	1b\n"
 	".previous"
-	: "=r" (tmp), "=m" (__dummy_lock(lock))
-	: "m"(__dummy_lock(lock)));
+	: "=r" (tmp), "=m" (lock->lock)
+	: "m"(lock->lock) : "memory");
 }
 
 #define spin_trylock(lock) (!test_and_set_bit(0,(lock)))
@@ -119,9 +116,8 @@
 	"	bne	%1,6b\n"
 	"	br	1b\n"
 	".previous"
-	: "=m" (__dummy_lock(lock)), "=&r" (regx)
-	: "0" (__dummy_lock(lock))
-	);
+	: "=m" (*(volatile int *)lock), "=&r" (regx)
+	: "0" (*(volatile int *)lock) : "memory");
 }
 
 static inline void read_lock(rwlock_t * lock)
@@ -140,9 +136,8 @@
 	"	blbs	%1,6b\n"
 	"	br	1b\n"
 	".previous"
-	: "=m" (__dummy_lock(lock)), "=&r" (regx)
-	: "m" (__dummy_lock(lock))
-	);
+	: "=m" (*(volatile int *)lock), "=&r" (regx)
+	: "m" (*(volatile int *)lock) : "memory");
 }
 #endif /* DEBUG_RWLOCK */
 
@@ -156,6 +151,7 @@
 {
 	long regx;
 	__asm__ __volatile__(
+	"	mb\n"
 	"1:	ldl_l	%1,%0\n"
 	"	addl	%1,2,%1\n"
 	"	stl_c	%1,%0\n"
@@ -163,8 +159,8 @@
 	".subsection 2\n"
 	"6:	br	1b\n"
 	".previous"
-	: "=m" (__dummy_lock(lock)), "=&r" (regx)
-	: "m" (__dummy_lock(lock)));
+	: "=m" (*(volatile int *)lock), "=&r" (regx)
+	: "m" (*(volatile int *)lock) : "memory");
 }
 
 #endif /* _ALPHA_SPINLOCK_H */