diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /include/asm-sparc/bug.h | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'include/asm-sparc/bug.h')
| -rw-r--r-- | include/asm-sparc/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sparc/bug.h b/include/asm-sparc/bug.h index 0d30a67d87a3..04151208189f 100644 --- a/include/asm-sparc/bug.h +++ b/include/asm-sparc/bug.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _SPARC_BUG_H | 1 | #ifndef _SPARC_BUG_H |
| 2 | #define _SPARC_BUG_H | 2 | #define _SPARC_BUG_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_BUG | ||
| 4 | /* Only use the inline asm until a gcc release that can handle __builtin_trap | 5 | /* Only use the inline asm until a gcc release that can handle __builtin_trap |
| 5 | * -rob 2003-06-25 | 6 | * -rob 2003-06-25 |
| 6 | * | 7 | * |
| @@ -26,6 +27,8 @@ extern void do_BUG(const char *file, int line); | |||
| 26 | #endif | 27 | #endif |
| 27 | 28 | ||
| 28 | #define HAVE_ARCH_BUG | 29 | #define HAVE_ARCH_BUG |
| 30 | #endif | ||
| 31 | |||
| 29 | #include <asm-generic/bug.h> | 32 | #include <asm-generic/bug.h> |
| 30 | 33 | ||
| 31 | #endif | 34 | #endif |