diff options
| author |   David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 08:14:09 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 08:14:09 +0100 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-x86_64/bug.h | |
| parent | [AUDIT] Update UML audit-syscall-{entry,exit} calls to new prototypes (diff) | |
| parent | [PATCH] JFS: Don't allocate extents that overlap existing extents (diff) | |
| download | linux-dev-27b030d58c8e72fc7a95187a791bd9406e350f02.tar.xz linux-dev-27b030d58c8e72fc7a95187a791bd9406e350f02.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/bug.h')
| -rw-r--r-- | include/asm-x86_64/bug.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86_64/bug.h b/include/asm-x86_64/bug.h index 19aed6e78fec..bdbf66eab6ee 100644 --- a/include/asm-x86_64/bug.h +++ b/include/asm-x86_64/bug.h @@ -15,11 +15,13 @@ struct bug_frame { unsigned short line; } __attribute__((packed)); +#ifdef CONFIG_BUG #define HAVE_ARCH_BUG #define BUG() \ asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \ "i"(__LINE__), "i" (__stringify(__FILE__))) void out_of_line_bug(void); -#include <asm-generic/bug.h> +#endif +#include <asm-generic/bug.h> #endif |