From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 10 Aug 2007 20:31:06 +0000 (+0200)
Subject: i386: really stop MCEs during code patching
X-Git-Tag: MMI-PSA29.97-13-9~40793
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2d0251f6faa2cf341500a44310bbaa815a8a972;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

i386: really stop MCEs during code patching

It's CONFIG_X86_MCE, not CONFIG_MCE.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c
index 27a6b0c9a7cc..1b66d5c70eaf 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
@@ -388,7 +388,7 @@ void __init alternative_instructions(void)
 	   that might execute the to be patched code.
 	   Other CPUs are not running. */
 	stop_nmi();
-#ifdef CONFIG_MCE
+#ifdef CONFIG_X86_MCE
 	stop_mce();
 #endif
 
@@ -426,7 +426,7 @@ void __init alternative_instructions(void)
 	local_irq_restore(flags);
 
 	restart_nmi();
-#ifdef CONFIG_MCE
+#ifdef CONFIG_X86_MCE
 	restart_mce();
 #endif
 }