Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-s390 / bug.h

diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 2b8d6d4dffcfdc6a696cd41877a94ba0af262dca..7ddaa05b98d8406b9988921b5275179083bd8e94 100644 (file)
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -3,12 +3,16 @@
 
 #include <linux/kernel.h>
 
+#ifdef CONFIG_BUG
+
 #define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        __asm__ __volatile__(".long 0"); \
+       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+       __builtin_trap(); \
 } while (0)
 
 #define HAVE_ARCH_BUG
+#endif
+
 #include <asm-generic/bug.h>
 
 #endif