patch-2.4.0-test6 linux/include/asm-m68k/system.h

• Lines: 19
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/include/asm-m68k/system.h
• Orig date: Fri Jan 28 15:09:09 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-m68k/system.h linux/include/asm-m68k/system.h
@@ -52,7 +52,7 @@
 #else
 #include <asm/hardirq.h>
 #define __sti() ({								\
-	if (!local_irq_count[smp_processor_id()])				\
+	if (!local_irq_count(smp_processor_id()))				\
 		asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");	\
 })
 #endif
@@ -80,8 +80,7 @@
 #define mb()   asm volatile (""   : : :"memory")
 #define rmb()  asm volatile (""   : : :"memory")
 #define wmb()  asm volatile (""   : : :"memory")
-#define set_rmb(var, value)    do { xchg(&var, value); } while (0)
-#define set_mb(var, value)     set_rmb(var, value)
+#define set_mb(var, value)    do { xchg(&var, value); } while (0)
 #define set_wmb(var, value)    do { var = value; wmb(); } while (0)