Signed-off-by: Andrew Morton --- arch/i386/kernel/traps.c | 3 +-- arch/x86_64/kernel/traps.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN arch/i386/kernel/traps.c~x86_64-mm-nmi-message arch/i386/kernel/traps.c --- a/arch/i386/kernel/traps.c~x86_64-mm-nmi-message +++ a/arch/i386/kernel/traps.c @@ -705,8 +705,7 @@ mem_parity_error(unsigned char reason, s { 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"); diff -puN arch/x86_64/kernel/traps.c~x86_64-mm-nmi-message arch/x86_64/kernel/traps.c --- a/arch/x86_64/kernel/traps.c~x86_64-mm-nmi-message +++ a/arch/x86_64/kernel/traps.c @@ -782,8 +782,7 @@ mem_parity_error(unsigned char reason, s { 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"); _