diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 22:13:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 22:13:16 +0200 |
| commit | d20ead9e86881bc7ae84e385f47b5196b7d93aac (patch) | |
| tree | ed27dd5db5f8447e4b3f541f0ec38219085d2f32 /include/asm-x86/bug.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | x86: delete vsyscall files during make clean (diff) | |
| download | linux-d20ead9e86881bc7ae84e385f47b5196b7d93aac.tar.xz linux-d20ead9e86881bc7ae84e385f47b5196b7d93aac.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...
Diffstat (limited to 'include/asm-x86/bug.h')
| -rw-r--r-- | include/asm-x86/bug.h | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h index c655d7f3a5e0..fd8bdc639c48 100644 --- a/include/asm-x86/bug.h +++ b/include/asm-x86/bug.h @@ -1,5 +1,42 @@ +#ifndef _ASM_X86_BUG_H +#define _ASM_X86_BUG_H + +#ifdef CONFIG_BUG +#define HAVE_ARCH_BUG + +#ifdef CONFIG_DEBUG_BUGVERBOSE + #ifdef CONFIG_X86_32 -# include "bug_32.h" +# define __BUG_C0 "2:\t.long 1b, %c0\n" #else -# include "bug_64.h" +# define __BUG_C0 "2:\t.quad 1b, %c0\n" +#endif + +#define BUG() \ + do { \ + asm volatile("1:\tud2\n" \ + ".pushsection __bug_table,\"a\"\n" \ + __BUG_C0 \ + "\t.word %c1, 0\n" \ + "\t.org 2b+%c2\n" \ + ".popsection" \ + : : "i" (__FILE__), "i" (__LINE__), \ + "i" (sizeof(struct bug_entry))); \ + for(;;) ; \ + } while(0) + +#else +#define BUG() \ + do { \ + asm volatile("ud2"); \ + for(;;) ; \ + } while(0) +#endif + +void out_of_line_bug(void); +#else /* CONFIG_BUG */ +static inline void out_of_line_bug(void) { } +#endif /* !CONFIG_BUG */ + +#include <asm-generic/bug.h> #endif |