diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 20:47:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 13:28:48 -0700 |
| commit | e8006b060f3982a969c5170aa869628d54dd30d8 (patch) | |
| tree | 0a08439bda44aaa4df3b68bb0b0b0795e291888c /include/asm-m68k | |
| parent | eb4db450aa19dfc806fbd9747879c420e154dc33 (diff) | |
m68k: Make gcc aware that BUG() does not return
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>
Diffstat (limited to 'include/asm-m68k')
| -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 |