From b97acd6d0db9f21245f5445c461b25ac7198e756 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 10 Aug 2007 22:31:06 +0200
Subject: [PATCH] --- yaml --- r: 63881 b: refs/heads/master c:
 d2d0251f6faa2cf341500a44310bbaa815a8a972 h: refs/heads/master i:   63879:
 f64188db68904fd957963087baa75f602332b24a v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/alternative.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fa4fdb069705..36c8f87437fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08da5a2ca479c5e8805dc3f77fd77176c4293399
+refs/heads/master: d2d0251f6faa2cf341500a44310bbaa815a8a972
diff --git a/trunk/arch/i386/kernel/alternative.c b/trunk/arch/i386/kernel/alternative.c
index 27a6b0c9a7cc..1b66d5c70eaf 100644
--- a/trunk/arch/i386/kernel/alternative.c
+++ b/trunk/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
 }