Commit 8d62810b authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix CONFIG_X86_MCE

Fix CONFIG_X86_MCE to really enable/disable the MCE code
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8051c7aa
...@@ -8,8 +8,8 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ ...@@ -8,8 +8,8 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
x8664_ksyms.o i387.o syscall.o vsyscall.o \ x8664_ksyms.o i387.o syscall.o vsyscall.o \
setup64.o bootflag.o e820.o reboot.o warmreboot.o quirks.o setup64.o bootflag.o e820.o reboot.o warmreboot.o quirks.o
obj-y += mce.o
obj-$(CONFIG_X86_MCE) += mce.o
obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
obj-$(CONFIG_ACPI_BOOT) += acpi/ obj-$(CONFIG_ACPI_BOOT) += acpi/
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
......
...@@ -907,6 +907,7 @@ ENTRY(divide_error) ...@@ -907,6 +907,7 @@ ENTRY(divide_error)
ENTRY(spurious_interrupt_bug) ENTRY(spurious_interrupt_bug)
zeroentry do_spurious_interrupt_bug zeroentry do_spurious_interrupt_bug
#ifdef CONFIG_X86_MCE
/* runs on exception stack */ /* runs on exception stack */
ENTRY(machine_check) ENTRY(machine_check)
CFI_STARTPROC CFI_STARTPROC
...@@ -915,6 +916,7 @@ ENTRY(machine_check) ...@@ -915,6 +916,7 @@ ENTRY(machine_check)
paranoidentry do_machine_check paranoidentry do_machine_check
jmp paranoid_exit jmp paranoid_exit
CFI_ENDPROC CFI_ENDPROC
#endif
ENTRY(call_debug) ENTRY(call_debug)
zeroentry do_call_debug zeroentry do_call_debug
......
...@@ -909,7 +909,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c) ...@@ -909,7 +909,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; boot_cpu_data.x86_capability[i] &= c->x86_capability[i];
} }
#ifdef CONFIG_X86_MCE
mcheck_init(c); mcheck_init(c);
#endif
} }
......
...@@ -877,7 +877,9 @@ void __init trap_init(void) ...@@ -877,7 +877,9 @@ void __init trap_init(void)
set_intr_gate(15,&spurious_interrupt_bug); set_intr_gate(15,&spurious_interrupt_bug);
set_intr_gate(16,&coprocessor_error); set_intr_gate(16,&coprocessor_error);
set_intr_gate(17,&alignment_check); set_intr_gate(17,&alignment_check);
#ifdef CONFIG_X86_MCE
set_intr_gate_ist(18,&machine_check, MCE_STACK); set_intr_gate_ist(18,&machine_check, MCE_STACK);
#endif
set_intr_gate(19,&simd_coprocessor_error); set_intr_gate(19,&simd_coprocessor_error);
#ifdef CONFIG_IA32_EMULATION #ifdef CONFIG_IA32_EMULATION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment