Merge branch 'master'

1 files changed, 10 insertions, 1 deletions

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