]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] x86: Mention PCI instead of RAM in NMI parity error message
authorAndi Kleen <ak@suse.de>
Thu, 7 Dec 2006 01:14:03 +0000 (02:14 +0100)
committerAndi Kleen <andi@basil.nowhere.org>
Thu, 7 Dec 2006 01:14:03 +0000 (02:14 +0100)
On modern systems RAM errors don't cause NMIs, but it's usually
caused by PCI SERR. Mention PCI instead of RAM in the printk.

Reported by r_hayashi@ctc-g.co.jp (Ryutaro Hayashi)

Cc: r_hayashi@ctc-g.co.jp
Signed-off-by: Andi Kleen <ak@suse.de>
arch/i386/kernel/traps.c
arch/x86_64/kernel/traps.c

index 4a6fa2837df20c6b6f12729e3ca0e43505fd00a4..237f4884a1e170ad2eaf0c20d8ca12c054d182e8 100644 (file)
@@ -708,8 +708,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
 {
        printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on "
                "CPU %d.\n", reason, smp_processor_id());
-       printk(KERN_EMERG "You probably have a hardware problem with your RAM "
-                       "chips\n");
+       printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
        if (panic_on_unrecovered_nmi)
                 panic("NMI: Not continuing");
 
index e37b4d77d5a80cf44237b73ccb7379a3d65779a1..70bfaab9822c4a3980d8623804debf472f64765f 100644 (file)
@@ -793,8 +793,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
 {
        printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
                reason);
-       printk(KERN_EMERG "You probably have a hardware problem with your "
-               "RAM chips\n");
+       printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n");
 
        if (panic_on_unrecovered_nmi)
                panic("NMI: Not continuing");