From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Tue, 23 Jun 2009 03:40:54 +0000 (+0900)
Subject: x86, mce: Fix mce resume on 32bit
X-Git-Tag: MMI-PSA29.97-13-9~27557^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7262b6e4a4cc18d0f67df145d032c843e4bc382b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index d277ef1eea51..b3d20b9cac63 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
 }