diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-ia64/bug.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-ia64/bug.h')
| -rw-r--r-- | include/asm-ia64/bug.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-ia64/bug.h b/include/asm-ia64/bug.h index 3aa0a0a5474b..823616b5020b 100644 --- a/include/asm-ia64/bug.h +++ b/include/asm-ia64/bug.h | |||
| @@ -2,11 +2,7 @@ | |||
| 2 | #define _ASM_IA64_BUG_H | 2 | #define _ASM_IA64_BUG_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_BUG | 4 | #ifdef CONFIG_BUG |
| 5 | #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | 5 | #define ia64_abort() __builtin_trap() |
| 6 | # define ia64_abort() __builtin_trap() | ||
| 7 | #else | ||
| 8 | # define ia64_abort() (*(volatile int *) 0 = 0) | ||
| 9 | #endif | ||
| 10 | #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) | 6 | #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) |
| 11 | 7 | ||
| 12 | /* should this BUG be made generic? */ | 8 | /* should this BUG be made generic? */ |