From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Fri, 24 Mar 2006 11:15:16 +0000 (-0800)
Subject: [PATCH] s390: BUG() warnings
X-Git-Tag: firefly_0821_release~37398
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4896cef8e33e668734234543afb58eb171476ff3;p=firefly-linux-kernel-4.4.55.git

[PATCH] s390: BUG() warnings

Use __builtin_trap instead of an inline assembly in the BUG() macro.  That way
the compiler knows that BUG() won't return.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index a2e7430aafa6..7ddaa05b98d8 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -4,9 +4,10 @@
 #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