diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /include/asm-m68k/bug.h | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
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 @@ | |||
| 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 | ||