aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/traps.c
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/x86_64/kernel/traps.c
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/x86_64/kernel/traps.c')
-rw-r--r--arch/x86_64/kernel/traps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 42bc070fdf1..b18829db2a6 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -732,6 +732,8 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
732{ 732{
733 printk("Uhhuh. NMI received. Dazed and confused, but trying to continue\n"); 733 printk("Uhhuh. NMI received. Dazed and confused, but trying to continue\n");
734 printk("You probably have a hardware problem with your RAM chips\n"); 734 printk("You probably have a hardware problem with your RAM chips\n");
735 if (panic_on_unrecovered_nmi)
736 panic("NMI: Not continuing");
735 737
736 /* Clear and disable the memory parity error line. */ 738 /* Clear and disable the memory parity error line. */
737 reason = (reason & 0xf) | 4; 739 reason = (reason & 0xf) | 4;
@@ -757,6 +759,10 @@ unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
757{ printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); 759{ printk("Uhhuh. NMI received for unknown reason %02x.\n", reason);
758 printk("Dazed and confused, but trying to continue\n"); 760 printk("Dazed and confused, but trying to continue\n");
759 printk("Do you have a strange power saving mode enabled?\n"); 761 printk("Do you have a strange power saving mode enabled?\n");
762
763 if (panic_on_unrecovered_nmi)
764 panic("NMI: Not continuing");
765
760} 766}
761 767
762/* Runs on IST stack. This code must keep interrupts off all the time. 768/* Runs on IST stack. This code must keep interrupts off all the time.