diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:00:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:00:25 -0400 |
| commit | c206d44ffdd539f5f4553e1a92cc7711084c1d3c (patch) | |
| tree | c2bfef721c91c3f468fb9a52bf69a785e4889128 /arch/x86/include/asm/kdebug.h | |
| parent | 83ae170092c8ec4d8a268d93438054e32493ee17 (diff) | |
| parent | 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage
x86, UV: Initialize BAU hub map
x86, UV: Make kdump avoid stack dumps
Diffstat (limited to 'arch/x86/include/asm/kdebug.h')
| -rw-r--r-- | arch/x86/include/asm/kdebug.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index fa7c0b974761..5bdfca86581b 100644 --- a/arch/x86/include/asm/kdebug.h +++ b/arch/x86/include/asm/kdebug.h | |||
| @@ -33,5 +33,11 @@ extern void __show_regs(struct pt_regs *regs, int all); | |||
| 33 | extern void show_regs(struct pt_regs *regs); | 33 | extern void show_regs(struct pt_regs *regs); |
| 34 | extern unsigned long oops_begin(void); | 34 | extern unsigned long oops_begin(void); |
| 35 | extern void oops_end(unsigned long, struct pt_regs *, int signr); | 35 | extern void oops_end(unsigned long, struct pt_regs *, int signr); |
| 36 | #ifdef CONFIG_KEXEC | ||
| 37 | extern int in_crash_kexec; | ||
| 38 | #else | ||
| 39 | /* no crash dump is ever in progress if no crash kernel can be kexec'd */ | ||
| 40 | #define in_crash_kexec 0 | ||
| 41 | #endif | ||
| 36 | 42 | ||
| 37 | #endif /* _ASM_X86_KDEBUG_H */ | 43 | #endif /* _ASM_X86_KDEBUG_H */ |