summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 18:00:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 18:00:25 -0700
commitc206d44ffdd539f5f4553e1a92cc7711084c1d3c (patch)
treec2bfef721c91c3f468fb9a52bf69a785e4889128 /arch/x86/include
parent83ae170092c8ec4d8a268d93438054e32493ee17 (diff)
parent1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 (diff)
downloadop-kernel-dev-c206d44ffdd539f5f4553e1a92cc7711084c1d3c.zip
op-kernel-dev-c206d44ffdd539f5f4553e1a92cc7711084c1d3c.tar.gz
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')
-rw-r--r--arch/x86/include/asm/kdebug.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h
index fa7c0b9..5bdfca8 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);
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 */
OpenPOWER on IntegriCloud