vserver 2.0 rc7

[linux-2.6.git] / include / asm-sh / bug.h

diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index ea41e17..70508a3 100644 (file)
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -3,15 +3,18 @@
 
 #include <linux/config.h>
 
+#ifdef CONFIG_BUG
 /*
  * Tell the user there is some problem.
  */
 #define BUG() do { \
        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-       asm volatile("nop"); \
+       *(volatile int *)0 = 0; \
 } while (0)
 
 #define HAVE_ARCH_BUG
+#endif
+
 #include <asm-generic/bug.h>
 
 #endif