summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-06-10 16:07:17 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-06-10 16:07:17 +0000
commit3f26dad5923293dc1b3027dd488585549404d92e (patch)
treec92a1302380ac8c783f667601f0faef17de9bbc8
parent9a493792f424f0bdac8c2b7626e7f2c0b928d2d3 (diff)
Make a few macros bulletproof.
-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