diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
commit | a8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch) | |
tree | fa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /include/asm-m68k/bug.h | |
parent | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff) | |
parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) |
Merge branch 'linus' into x86/pattip-x86-pat-2008-05-19-07-23-07
Diffstat (limited to 'include/asm-m68k/bug.h')
-rw-r--r-- | include/asm-m68k/bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h index 7b60776cc966..e5b528deb8a8 100644 --- a/include/asm-m68k/bug.h +++ b/include/asm-m68k/bug.h @@ -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 |