]> err.no Git - linux-2.6/commitdiff
m68k: Make gcc aware that BUG() does not return
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 18 May 2008 18:47:12 +0000 (20:47 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 May 2008 20:28:48 +0000 (13:28 -0700)
Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG()
macros (as suggested by Andrew Pinski), to kill warnings in code that assumes
BUG() does not return.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-m68k/bug.h

index 7b60776cc966dfd15be72db4366cc33a78bd8f9f..e5b528deb8a8496bb873c1ddffdf982eb074cbb2 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CONFIG_SUN3
 #define BUG() do { \
        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-       asm volatile("illegal"); \
+       __builtin_trap(); \
 } while (0)
 #else
 #define BUG() do { \
@@ -17,7 +17,7 @@
 #endif
 #else
 #define BUG() do { \
-       asm volatile("illegal"); \
+       __builtin_trap(); \
 } while (0)
 #endif