Merge branch 'gart/fixes' into amd-iommu/2.6.33

[cascardo/linux.git] / arch / x86 / power / cpu.c

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 417c9f5..8aa85f1 100644 (file)
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -243,10 +243,6 @@ static void __restore_processor_state(struct saved_context *ctxt)
 
        do_fpu_end();
        mtrr_bp_restore();
-
-#ifdef CONFIG_X86_OLD_MCE
-       mcheck_init(&boot_cpu_data);
-#endif
 }
 
 /* Needed by apm.c */