summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-mips/system.h6
-rw-r--r--include/asm-mips/wbflush.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 1c1c8c575..565e1fcf4 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -149,9 +149,9 @@ extern void __global_restore_flags(unsigned long);
#ifdef CONFIG_CPU_HAS_WB
#include <asm/wbflush.h>
-#define rmb()
-#define wmb() wbflush()
-#define mb() wbflush()
+#define rmb() do { } while(0)
+#define wmb() wbflush()
+#define mb() wbflush()
#else /* CONFIG_CPU_HAS_WB */
diff --git a/include/asm-mips/wbflush.h b/include/asm-mips/wbflush.h
index 31a367909..0d9c9a868 100644
--- a/include/asm-mips/wbflush.h
+++ b/include/asm-mips/wbflush.h
@@ -27,7 +27,7 @@ extern void (*__wbflush) (void);
* we don't need no stinkin' wbflush
*/
-#define wbflush()
+#define wbflush() do { } while(0)
#endif