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-mips/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-mips/bug.h')
| -rw-r--r-- | include/asm-mips/bug.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h index eb94bb96cfbc..3f594b440abc 100644 --- a/include/asm-mips/bug.h +++ b/include/asm-mips/bug.h | |||
| @@ -3,12 +3,14 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm/break.h> | 4 | #include <asm/break.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_BUG | ||
| 7 | #define HAVE_ARCH_BUG | ||
| 6 | #define BUG() \ | 8 | #define BUG() \ |
| 7 | do { \ | 9 | do { \ |
| 8 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ | 10 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ |
| 9 | } while (0) | 11 | } while (0) |
| 12 | #endif | ||
| 10 | 13 | ||
| 11 | #define HAVE_ARCH_BUG | ||
| 12 | #include <asm-generic/bug.h> | 14 | #include <asm-generic/bug.h> |
| 13 | 15 | ||
| 14 | #endif | 16 | #endif |