diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-ia64/bug.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ia64/bug.h')
| -rw-r--r-- | include/asm-ia64/bug.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/bug.h b/include/asm-ia64/bug.h index 2c0cd51e8856..3aa0a0a5474b 100644 --- a/include/asm-ia64/bug.h +++ b/include/asm-ia64/bug.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _ASM_IA64_BUG_H | 1 | #ifndef _ASM_IA64_BUG_H |
| 2 | #define _ASM_IA64_BUG_H | 2 | #define _ASM_IA64_BUG_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_BUG | ||
| 4 | #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | 5 | #if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) |
| 5 | # define ia64_abort() __builtin_trap() | 6 | # define ia64_abort() __builtin_trap() |
| 6 | #else | 7 | #else |
| @@ -8,8 +9,10 @@ | |||
| 8 | #endif | 9 | #endif |
| 9 | #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) | 10 | #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) |
| 10 | 11 | ||
| 11 | /* should this BUG should be made generic? */ | 12 | /* should this BUG be made generic? */ |
| 12 | #define HAVE_ARCH_BUG | 13 | #define HAVE_ARCH_BUG |
| 14 | #endif | ||
| 15 | |||
| 13 | #include <asm-generic/bug.h> | 16 | #include <asm-generic/bug.h> |
| 14 | 17 | ||
| 15 | #endif | 18 | #endif |