Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[firefly-linux-kernel-4.4.55.git] / include / asm-m32r / system.h

diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 9e618afec6ed7bd6480962dfa85abb2931c61e7a..99ee09889ff78578ca1c913e1c75a1ce4b65f319 100644 (file)
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -328,15 +328,15 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 #define smp_rmb()      rmb()
 #define smp_wmb()      wmb()
 #define smp_read_barrier_depends()     read_barrier_depends()
+#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #else
 #define smp_mb()       barrier()
 #define smp_rmb()      barrier()
 #define smp_wmb()      barrier()
 #define smp_read_barrier_depends()     do { } while (0)
+#define set_mb(var, value) do { var = value; barrier(); } while (0)
 #endif
 
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
-
 #define arch_align_stack(x) (x)
 
-#endif  /* _ASM_M32R_SYSTEM_H */
+#endif /* _ASM_M32R_SYSTEM_H */