diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 14:47:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 16:28:48 -0400 |
commit | e8006b060f3982a969c5170aa869628d54dd30d8 (patch) | |
tree | 0a08439bda44aaa4df3b68bb0b0b0795e291888c | |
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>
-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 @@ | |||
7 | #ifndef CONFIG_SUN3 | 7 | #ifndef CONFIG_SUN3 |
8 | #define BUG() do { \ | 8 | #define BUG() do { \ |
9 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ | 9 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ |
10 | asm volatile("illegal"); \ | 10 | __builtin_trap(); \ |
11 | } while (0) | 11 | } while (0) |
12 | #else | 12 | #else |
13 | #define BUG() do { \ | 13 | #define BUG() do { \ |
@@ -17,7 +17,7 @@ | |||
17 | #endif | 17 | #endif |
18 | #else | 18 | #else |
19 | #define BUG() do { \ | 19 | #define BUG() do { \ |
20 | asm volatile("illegal"); \ | 20 | __builtin_trap(); \ |
21 | } while (0) | 21 | } while (0) |
22 | #endif | 22 | #endif |
23 | 23 | ||