Merge commit 'perf/core' into perf/hw-breakpoint

[karo-tx-linux.git] / arch / x86 / power / cpu.c

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 9e63db8cdee44e76a3d6ab351b25b9d9081d429b..e09a44fc4664d94a51f3662ef7bdb448be1caee6 100644 (file)
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -224,11 +224,7 @@ static void __restore_processor_state(struct saved_context *ctxt)
        fix_processor_context();
 
        do_fpu_end();
-       mtrr_ap_init();
-
-#ifdef CONFIG_X86_OLD_MCE
-       mcheck_init(&boot_cpu_data);
-#endif
+       mtrr_bp_restore();
 }
 
 /* Needed by apm.c */