From cd959512e3a38d53cfc99c2a009f65835320d6c9 Mon Sep 17 00:00:00 2001 From: Cliff Wickman Date: Mon, 9 Aug 2010 16:11:22 -0500 Subject: [PATCH] --- yaml --- r: 209332 b: refs/heads/master c: 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kdebug.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c7d782433c8c..633d6155e896 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4026cfd8febcd63dd278894108839f30e525a0e +refs/heads/master: 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 diff --git a/trunk/arch/x86/include/asm/kdebug.h b/trunk/arch/x86/include/asm/kdebug.h index 7a2910b3512b..5bdfca86581b 100644 --- a/trunk/arch/x86/include/asm/kdebug.h +++ b/trunk/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 */