[PATCH] x86_64: Fix CONFIG_X86_MCE

Fix CONFIG_X86_MCE to really enable/disable the MCE code
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/x86_64/kernel/Makefile

@@ -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 \
 		x8664_ksyms.o i387.o syscall.o vsyscall.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_ACPI_BOOT)		+= acpi/
 obj-$(CONFIG_X86_MSR)		+= msr.o

arch/x86_64/kernel/entry.S

@@ -907,6 +907,7 @@ ENTRY(divide_error)
 ENTRY(spurious_interrupt_bug)
 	zeroentry do_spurious_interrupt_bug
 
+#ifdef CONFIG_X86_MCE
 	/* runs on exception stack */
 ENTRY(machine_check)
 	CFI_STARTPROC
@@ -915,6 +916,7 @@ ENTRY(machine_check)
 	paranoidentry do_machine_check
 	jmp paranoid_exit
 	CFI_ENDPROC
+#endif
 
 ENTRY(call_debug)
        zeroentry do_call_debug

arch/x86_64/kernel/setup.c

@@ -909,7 +909,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 			boot_cpu_data.x86_capability[i] &= c->x86_capability[i];
 	}
 
+#ifdef CONFIG_X86_MCE
 	mcheck_init(c);
+#endif
 }
  
 

arch/x86_64/kernel/traps.c

@@ -877,7 +877,9 @@ void __init trap_init(void)
 	set_intr_gate(15,&spurious_interrupt_bug);
 	set_intr_gate(16,&coprocessor_error);
 	set_intr_gate(17,&alignment_check);
+#ifdef CONFIG_X86_MCE
 	set_intr_gate_ist(18,&machine_check, MCE_STACK); 
+#endif
 	set_intr_gate(19,&simd_coprocessor_error);
 
 #ifdef CONFIG_IA32_EMULATION