linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 8768983..a2e7430 100644 (file)
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -4,19 +4,9 @@
 #include <linux/kernel.h>
 
 #ifdef CONFIG_BUG
-
-static inline __attribute__((noreturn)) void __do_illegal_op(void)
-{
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-       __builtin_trap();
-#else
-       asm volatile(".long 0");
-#endif
-}
-
 #define BUG() do { \
-       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-       __do_illegal_op(); \
+        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+        __asm__ __volatile__(".long 0"); \
 } while (0)
 
 #define HAVE_ARCH_BUG