aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/traps.c3
-rw-r--r--arch/x86_64/kernel/traps.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 4a6fa2837df2..237f4884a1e1 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -708,8 +708,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
708{ 708{
709 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " 709 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on "
710 "CPU %d.\n", reason, smp_processor_id()); 710 "CPU %d.\n", reason, smp_processor_id());
711 printk(KERN_EMERG "You probably have a hardware problem with your RAM " 711 printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
712 "chips\n");
713 if (panic_on_unrecovered_nmi) 712 if (panic_on_unrecovered_nmi)
714 panic("NMI: Not continuing"); 713 panic("NMI: Not continuing");
715 714
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index e37b4d77d5a8..70bfaab9822c 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -793,8 +793,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
793{ 793{
794 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n", 794 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
795 reason); 795 reason);
796 printk(KERN_EMERG "You probably have a hardware problem with your " 796 printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
797 "RAM chips\n");
798 797
799 if (panic_on_unrecovered_nmi) 798 if (panic_on_unrecovered_nmi)
800 panic("NMI: Not continuing"); 799 panic("NMI: Not continuing");