This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / x86_64 / kernel / entry.S

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index d8d906a..17d74eb 100644 (file)
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -907,7 +907,6 @@ 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
@@ -916,7 +915,6 @@ ENTRY(machine_check)
        paranoidentry do_machine_check
        jmp paranoid_exit
        CFI_ENDPROC
-#endif
 
 ENTRY(call_debug)
        zeroentry do_call_debug