diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
| commit | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (patch) | |
| tree | 541909f86c31fee97cd70d28ec2fe5c23e1ceb02 /include/asm-mips/bug.h | |
| parent | f1e691a24955ea987f021f378324fb5003b1b208 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-mips/bug.h')
| -rw-r--r-- | include/asm-mips/bug.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h index 3f594b440abc..87d49a5bdc63 100644 --- a/include/asm-mips/bug.h +++ b/include/asm-mips/bug.h | |||
| @@ -1,16 +1,21 @@ | |||
| 1 | #ifndef __ASM_BUG_H | 1 | #ifndef __ASM_BUG_H |
| 2 | #define __ASM_BUG_H | 2 | #define __ASM_BUG_H |
| 3 | 3 | ||
| 4 | #include <asm/break.h> | 4 | #include <linux/config.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 7 | #define HAVE_ARCH_BUG | 7 | |
| 8 | #include <asm/break.h> | ||
| 9 | |||
| 8 | #define BUG() \ | 10 | #define BUG() \ |
| 9 | do { \ | 11 | do { \ |
| 10 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ | 12 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ |
| 11 | } while (0) | 13 | } while (0) |
| 14 | |||
| 15 | #define HAVE_ARCH_BUG | ||
| 16 | |||
| 12 | #endif | 17 | #endif |
| 13 | 18 | ||
| 14 | #include <asm-generic/bug.h> | 19 | #include <asm-generic/bug.h> |
| 15 | 20 | ||
| 16 | #endif | 21 | #endif /* __ASM_BUG_H */ |