projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
854c879
)
x86, mce: Fix mce resume on 32bit
author
Hidetoshi Seto
<seto.hidetoshi@jp.fujitsu.com>
Tue, 23 Jun 2009 03:40:54 +0000
(12:40 +0900)
committer
H. Peter Anvin
<hpa@zytor.com>
Tue, 23 Jun 2009 20:36:17 +0000
(13:36 -0700)
Calling mcheck_init() on resume is required only with
CONFIG_X86_OLD_MCE=y.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/power/cpu.c
patch
|
blob
|
history
diff --git
a/arch/x86/power/cpu.c
b/arch/x86/power/cpu.c
index
d277ef1
..
b3d20b9
100644
(file)
--- a/
arch/x86/power/cpu.c
+++ b/
arch/x86/power/cpu.c
@@
-244,7
+244,7
@@
static void __restore_processor_state(struct saved_context *ctxt)
do_fpu_end();
mtrr_ap_init();
-#ifdef CONFIG_X86_
32
+#ifdef CONFIG_X86_
OLD_MCE
mcheck_init(&boot_cpu_data);
#endif
}