Prev: 2.6.36: Sound stop working
Next: ipc/shm.c: add RSS and swap size information to /proc/sysvipc/shm
From: tip-bot for Cliff Wickman on 12 Aug 2010 16:10
Commit-ID: 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1
Gitweb: http://git.kernel.org/tip/1d6225e8cc5598f2bc5c992f9c88b1137763e8e1
Author: Cliff Wickman <cpw(a)sgi.com>
AuthorDate: Mon, 9 Aug 2010 16:11:22 -0500
Committer: H. Peter Anvin <hpa(a)linux.intel.com>
CommitDate: Thu, 12 Aug 2010 12:23:55 -0700

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 <cpw(a)sgi.com>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
LKML-Reference: <E1OiZcw-0001Hb-2g(a)eag09.americas.sgi.com>
Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com>
---
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 7a2910b..5bdfca8 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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: 2.6.36: Sound stop working
Next: ipc/shm.c: add RSS and swap size information to /proc/sysvipc/shm