Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-m68k / bug.h

diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h
index 072ce274d53751d3ecbff96f0b2dca93b8056e97..e5b528deb8a8496bb873c1ddffdf982eb074cbb2 100644 (file)
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
@@ -1,14 +1,13 @@
 #ifndef _M68K_BUG_H
 #define _M68K_BUG_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_BUG
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 #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 { \
@@ -18,7 +17,7 @@
 #endif
 #else
 #define BUG() do { \
-       asm volatile("illegal"); \
+       __builtin_trap(); \
 } while (0)
 #endif