summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-06-23 12:40:54 +0900
committerH. Peter Anvin <hpa@zytor.com>2009-06-23 13:36:17 -0700
commit7262b6e4a4cc18d0f67df145d032c843e4bc382b (patch)
treeb09d9152d363ecdc44a73c75f43a92d1ebfe5bac
parent854c879f5abf309ebd378bea1ee41acf4ddf7194 (diff)
downloadop-kernel-dev-7262b6e4a4cc18d0f67df145d032c843e4bc382b.zip
op-kernel-dev-7262b6e4a4cc18d0f67df145d032c843e4bc382b.tar.gz
x86, mce: Fix mce resume on 32bit
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>
-rw-r--r--arch/x86/power/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index d277ef1..b3d20b9 100644
--- 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
}
OpenPOWER on IntegriCloud