projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'perf/core' into perf/hw-breakpoint
[cascardo/linux.git]
/
arch
/
x86
/
power
/
cpu.c
diff --git
a/arch/x86/power/cpu.c
b/arch/x86/power/cpu.c
index
9e63db8
..
e09a44f
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 */