git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86, pat: New i/f for driver to request memtype for IO regions
[safe/jmp/linux-2.6]
/
arch
/
x86
/
power
/
cpu.c
diff --git
a/arch/x86/power/cpu.c
b/arch/x86/power/cpu.c
index
b3d20b9
..
417c9f5
100644
(file)
--- a/
arch/x86/power/cpu.c
+++ b/
arch/x86/power/cpu.c
@@
-242,7
+242,7
@@
static void __restore_processor_state(struct saved_context *ctxt)
fix_processor_context();
do_fpu_end();
- mtrr_
ap_init
();
+ mtrr_
bp_restore
();
#ifdef CONFIG_X86_OLD_MCE
mcheck_init(&boot_cpu_data);