aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2006-09-26 04:52:27 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:27 -0400
commit8da5adda91df3d2fcc5300e68da491694c9af019 (patch)
treebae152dabd728ba2f7fead421276e3cc9a779141 /arch/i386
parente33e89ab1a8d295de0500b697f4f31c3ceee9aa2 (diff)
[PATCH] x86: Allow users to force a panic on NMI
To quote Alan Cox: The default Linux behaviour on an NMI of either memory or unknown is to continue operation. For many environments such as scientific computing it is preferable that the box is taken out and the error dealt with than an uncorrected parity/ECC error get propogated. A small number of systems do generate NMI's for bizarre random reasons such as power management so the default is unchanged. In other respects the new proc/sys entry works like the existing panic controls already in that directory. This is separate to the edac support - EDAC allows supported chipsets to handle ECC errors well, this change allows unsupported cases to at least panic rather than cause problems further down the line. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/traps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 7db664d0b25c..2f6cb8276480 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -635,6 +635,8 @@ static void mem_parity_error(unsigned char reason, struct pt_regs * regs)
635 "to continue\n"); 635 "to continue\n");
636 printk(KERN_EMERG "You probably have a hardware problem with your RAM " 636 printk(KERN_EMERG "You probably have a hardware problem with your RAM "
637 "chips\n"); 637 "chips\n");
638 if (panic_on_unrecovered_nmi)
639 panic("NMI: Not continuing");
638 640
639 /* Clear and disable the memory parity error line. */ 641 /* Clear and disable the memory parity error line. */
640 clear_mem_error(reason); 642 clear_mem_error(reason);
@@ -670,6 +672,10 @@ static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
670 reason, smp_processor_id()); 672 reason, smp_processor_id());
671 printk("Dazed and confused, but trying to continue\n"); 673 printk("Dazed and confused, but trying to continue\n");
672 printk("Do you have a strange power saving mode enabled?\n"); 674 printk("Do you have a strange power saving mode enabled?\n");
675
676 if (panic_on_unrecovered_nmi)
677 panic("NMI: Not continuing");
678
673} 679}
674 680
675static DEFINE_SPINLOCK(nmi_print_lock); 681static DEFINE_SPINLOCK(nmi_print_lock);