Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / arch / x86 / power / cpu.c

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 417c9f5b4afa700477ec29d26ac41945828eddfb..8aa85f17667e5034cfd2fae3eecd217c878d0529 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 */