aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-08-10 16:31:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-11 18:58:13 -0400
commitd2d0251f6faa2cf341500a44310bbaa815a8a972 (patch)
treefd8f960d5efe664fc83aac1af0fb6d06fd25c9ed /arch
parent08da5a2ca479c5e8805dc3f77fd77176c4293399 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/alternative.c4
1 files changed, 2 insertions, 2 deletions
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)
388 that might execute the to be patched code. 388 that might execute the to be patched code.
389 Other CPUs are not running. */ 389 Other CPUs are not running. */
390 stop_nmi(); 390 stop_nmi();
391#ifdef CONFIG_MCE 391#ifdef CONFIG_X86_MCE
392 stop_mce(); 392 stop_mce();
393#endif 393#endif
394 394
@@ -426,7 +426,7 @@ void __init alternative_instructions(void)
426 local_irq_restore(flags); 426 local_irq_restore(flags);
427 427
428 restart_nmi(); 428 restart_nmi();
429#ifdef CONFIG_MCE 429#ifdef CONFIG_X86_MCE
430 restart_mce(); 430 restart_mce();
431#endif 431#endif
432} 432}