X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-m68k%2Fsystem.h;h=198878b53a618c92cf5f37261b0476807754c722;hb=d9ff963801e4f7648c55a27413a1b1de59480a30;hp=d6dd8052cd6f199f5775486ba416c7c2075c2d74;hpb=be883da7594b0a2a02074e683673ae0e522566a4;p=mv-sheeva.git

diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h
index d6dd8052cd6..198878b53a6 100644
--- a/include/asm-m68k/system.h
+++ b/include/asm-m68k/system.h
@@ -78,18 +78,16 @@ static inline int irqs_disabled(void)
 #define mb()		barrier()
 #define rmb()		barrier()
 #define wmb()		barrier()
-#define read_barrier_depends()	do { } while(0)
-#define set_mb(var, value)    do { xchg(&var, value); } while (0)
-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)
+#define read_barrier_depends()	((void)0)
+#define set_mb(var, value)	({ (var) = (value); wmb(); })
 
 #define smp_mb()	barrier()
 #define smp_rmb()	barrier()
 #define smp_wmb()	barrier()
-#define smp_read_barrier_depends()	do { } while(0)
+#define smp_read_barrier_depends()	((void)0)
 
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((volatile struct __xchg_dummy *)(x))