]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
i386: really stop MCEs during code patching
authorAdrian Bunk <bunk@stusta.de>
Fri, 10 Aug 2007 20:31:06 +0000 (22:31 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 11 Aug 2007 22:58:13 +0000 (15:58 -0700)
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>
arch/i386/kernel/alternative.c

index 27a6b0c9a7cc2a9c5598a9df4b3ce1910bd36694..1b66d5c70eaf65fc88fa1146313071843a069993 100644 (file)
@@ -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
 }