X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-s390%2Fbug.h;h=7ddaa05b98d8406b9988921b5275179083bd8e94;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=87689836394442804ce094da6358dd898c272081;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 876898363..7ddaa05b9 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -5,18 +5,9 @@
 
 #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(); \
+	__builtin_trap(); \
 } while (0)
 
 #define HAVE_ARCH_BUG