X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sh%2Fbug.h;h=70508a360cd669b84ade8a09ab29f570d6dcf8de;hb=0aafd42982cc422558751c9e9e1327000694584a;hp=ea41e17bb9593deb712ec75e93fd8a59ac33655c;hpb=1a69f36a78895dad9a6b97ffa2d6d2b7c3975b5d;p=linux-2.6.git

diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index ea41e17bb..70508a360 100644
--- 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