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-alpha/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-alpha/bug.h')
| -rw-r--r-- | include/asm-alpha/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-alpha/bug.h b/include/asm-alpha/bug.h index ae1e0a5fa492..39a3e2a5017d 100644 --- a/include/asm-alpha/bug.h +++ b/include/asm-alpha/bug.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _ALPHA_BUG_H | 1 | #ifndef _ALPHA_BUG_H |
| 2 | #define _ALPHA_BUG_H | 2 | #define _ALPHA_BUG_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_BUG | ||
| 4 | #include <asm/pal.h> | 5 | #include <asm/pal.h> |
| 5 | 6 | ||
| 6 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the | 7 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the |
| @@ -10,6 +11,8 @@ | |||
| 10 | : : "i" (PAL_bugchk), "i"(__LINE__), "i"(__FILE__)) | 11 | : : "i" (PAL_bugchk), "i"(__LINE__), "i"(__FILE__)) |
| 11 | 12 | ||
| 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 |