diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-08-10 22:31:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 15:58:13 -0700 |
| commit | d2d0251f6faa2cf341500a44310bbaa815a8a972 (patch) | |
| tree | fd8f960d5efe664fc83aac1af0fb6d06fd25c9ed /arch/i386 | |
| parent | 08da5a2ca479c5e8805dc3f77fd77176c4293399 (diff) | |
| download | kernel_samsung_aries-d2d0251f6faa2cf341500a44310bbaa815a8a972.zip kernel_samsung_aries-d2d0251f6faa2cf341500a44310bbaa815a8a972.tar.gz kernel_samsung_aries-d2d0251f6faa2cf341500a44310bbaa815a8a972.tar.bz2 | |
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/i386')
| -rw-r--r-- | arch/i386/kernel/alternative.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 27a6b0c..1b66d5c 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 } |