diff options
| author | Cliff Wickman <[email protected]> | 2010-08-09 21:11:22 +0000 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2010-08-12 19:23:55 +0000 |
| commit | 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 (patch) | |
| tree | f9aef5abd49f947175ec038ca416840935ef581e /arch/x86/include/asm/kdebug.h | |
| parent | x86, UV: Initialize BAU hub map (diff) | |
| download | kernel-1d6225e8cc5598f2bc5c992f9c88b1137763e8e1.tar.gz kernel-1d6225e8cc5598f2bc5c992f9c88b1137763e8e1.zip | |
x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage
This replaces Version 1 of this patch, which broke the build when
CONFIG_KEXEC and CONFIG_CRASH_DUMP were configured off. In that case
the storage for the 'in_crash_kexec' flag was never built.
This version defines that flag as 0 if CONFIG_KEXEC is not set.
The patch is tested with all combinations of those two options.
Signed-off-by: Cliff Wickman <[email protected]>
Cc: Andrew Morton <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Diffstat (limited to 'arch/x86/include/asm/kdebug.h')
| -rw-r--r-- | arch/x86/include/asm/kdebug.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index 7a2910b3512b..5bdfca86581b 100644 --- a/arch/x86/include/asm/kdebug.h +++ b/arch/x86/include/asm/kdebug.h @@ -33,6 +33,11 @@ extern void __show_regs(struct pt_regs *regs, int all); extern void show_regs(struct pt_regs *regs); extern unsigned long oops_begin(void); extern void oops_end(unsigned long, struct pt_regs *, int signr); +#ifdef CONFIG_KEXEC extern int in_crash_kexec; +#else +/* no crash dump is ever in progress if no crash kernel can be kexec'd */ +#define in_crash_kexec 0 +#endif #endif /* _ASM_X86_KDEBUG_H */ |