aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_64.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-05-24 11:36:32 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 16:32:50 -0400
commite56b3a12c45e439169f2d1f7194be397667320a6 (patch)
tree2d29c0bf1b20e306b3905de8e67c798987e029f1 /arch/x86/kernel/traps_64.c
parentddca03c98a7f7ad5ab09967ff52d4ed60358c896 (diff)
x86: nmi - die_nmi() output message unification
Make 64bit die_nmi() to produce the same message as 32bit mode has Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: hpa@zytor.com Cc: mingo@redhat.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r--arch/x86/kernel/traps_64.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index adff76ea97c4..6a048ce3c787 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -614,7 +614,9 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)
614 * We are in trouble anyway, lets at least try 614 * We are in trouble anyway, lets at least try
615 * to get a message out. 615 * to get a message out.
616 */ 616 */
617 printk(str, smp_processor_id()); 617 printk(KERN_EMERG "%s", str);
618 printk(" on CPU%d, ip %08lx, registers:\n",
619 smp_processor_id(), regs->ip);
618 show_registers(regs); 620 show_registers(regs);
619 if (kexec_should_crash(current)) 621 if (kexec_should_crash(current))
620 crash_kexec(regs); 622 crash_kexec(regs);