diff --git a/[refs] b/[refs]
index 194755d05de8..1f1f9ea52f2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c04c28a656c1717fbe617efc40edabca3a85ca3
+refs/heads/master: 9ef308946fa8390136130a886b0d9a57867a747a
diff --git a/trunk/include/asm-m68k/system.h b/trunk/include/asm-m68k/system.h
index 131a0cb0f491..243dd13e6bfc 100644
--- a/trunk/include/asm-m68k/system.h
+++ b/trunk/include/asm-m68k/system.h
@@ -78,13 +78,13 @@ 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 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))))