diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-i386/bug.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-i386/bug.h')
| -rw-r--r-- | include/asm-i386/bug.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-i386/bug.h b/include/asm-i386/bug.h index 706eb511c330..8f79de19eb94 100644 --- a/include/asm-i386/bug.h +++ b/include/asm-i386/bug.h | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | * undefined" opcode for parsing in the trap handler. | 9 | * undefined" opcode for parsing in the trap handler. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #ifdef CONFIG_BUG | ||
| 13 | #define HAVE_ARCH_BUG | ||
| 12 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 14 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
| 13 | #define BUG() \ | 15 | #define BUG() \ |
| 14 | __asm__ __volatile__( "ud2\n" \ | 16 | __asm__ __volatile__( "ud2\n" \ |
| @@ -18,8 +20,7 @@ | |||
| 18 | #else | 20 | #else |
| 19 | #define BUG() __asm__ __volatile__("ud2\n") | 21 | #define BUG() __asm__ __volatile__("ud2\n") |
| 20 | #endif | 22 | #endif |
| 23 | #endif | ||
| 21 | 24 | ||
| 22 | #define HAVE_ARCH_BUG | ||
| 23 | #include <asm-generic/bug.h> | 25 | #include <asm-generic/bug.h> |
| 24 | |||
| 25 | #endif | 26 | #endif |