patch-2.2.4 linux/include/asm-sparc/spinlock.h

• Lines: 32
• Date: Mon Mar 22 07:56:10 1999
• Orig file: v2.2.3/linux/include/asm-sparc/spinlock.h
• Orig date: Thu Nov 19 09:56:29 1998

diff -u --recursive --new-file v2.2.3/linux/include/asm-sparc/spinlock.h linux/include/asm-sparc/spinlock.h
@@ -112,7 +112,7 @@
 	_do_read_unlock(lock, "read_unlock"); \
 	__restore_flags(flags); \
 } while(0)
-#define read_unlock_irq(lock)	do { _do_read_unlock(lock, "read_unlock_irq"); __sti() } while(0)
+#define read_unlock_irq(lock)	do { _do_read_unlock(lock, "read_unlock_irq"); __sti(); } while(0)
 #define read_unlock_irqrestore(lock, flags) do { _do_read_unlock(lock, "read_unlock_irqrestore"); __restore_flags(flags); } while(0)
 
 #define write_lock(lock) \
@@ -209,10 +209,10 @@
 	: "g2", "memory");
 }
 
-#define spin_lock_irqsave(lock, flags)		\
+#define spin_lock_irqsave(__lock, flags)	\
 do {						\
-	register spinlock_t *lp asm("g1");	\
-	lp = lock;				\
+	register spinlock_t *__lp asm("g1");	\
+	__lp = (__lock);			\
 	__asm__ __volatile__(			\
 	"rd	%%psr, %0\n\t"			\
 	"or	%0, %1, %%g2\n\t"		\
@@ -231,7 +231,7 @@
 	"b,a	1b\n\t"				\
 	".previous\n"				\
 	: "=r" (flags)				\
-	: "i" (PSR_PIL), "r" (lp)		\
+	: "i" (PSR_PIL), "r" (__lp)		\
 	: "g2", "memory", "cc");		\
 } while(0)