summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2007-10-24 12:58:01 +0200
committerIngo Molnar <mingo@elte.hu>2007-10-24 12:58:01 +0200
commit1fb473d8f45658532555b956ee24e25a0ba493cd (patch)
tree43849488949cfb2c68fdd820883d9eeca069c7b5 /arch
parentc9927c2bf4f45bb85e8b502ab3fb79ad6483c244 (diff)
downloadlinux-3.10-1fb473d8f45658532555b956ee24e25a0ba493cd.tar.gz
linux-3.10-1fb473d8f45658532555b956ee24e25a0ba493cd.tar.bz2
linux-3.10-1fb473d8f45658532555b956ee24e25a0ba493cd.zip
x86: fix CONFIG_KEXEC build breakage
X86_32 build fix to commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/crash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index af0253f94a9..8bb482ff091 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -25,7 +25,7 @@
#include <linux/kdebug.h>
#include <asm/smp.h>
-#ifdef X86_32
+#ifdef CONFIG_X86_32
#include <mach_ipi.h>
#else
#include <asm/mach_apic.h>
@@ -41,7 +41,7 @@ static int crash_nmi_callback(struct notifier_block *self,
unsigned long val, void *data)
{
struct pt_regs *regs;
-#ifdef X86_32
+#ifdef CONFIG_X86_32
struct pt_regs fixed_regs;
#endif
int cpu;
@@ -60,7 +60,7 @@ static int crash_nmi_callback(struct notifier_block *self,
return NOTIFY_STOP;
local_irq_disable();
-#ifdef X86_32
+#ifdef CONFIG_X86_32
if (!user_mode_vm(regs)) {
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;