2 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index 33cb8ecbb6dd..1a98705270a2 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -358,8 +358,8 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
                  */
                 local_inc(&__get_cpu_var(alert_counter));
                 if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz)
-                        die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs,
-                                panic_on_timeout);
+                        die_nmi("NMI Watchdog detected LOCKUP",
+                                regs, panic_on_timeout);
         } else {
                 __get_cpu_var(last_irq_sum) = sum;
                 local_set(&__get_cpu_var(alert_counter), 0);
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)
          * We are in trouble anyway, lets at least try
          * to get a message out.
          */
-        printk(str, smp_processor_id());
+        printk(KERN_EMERG "%s", str);
+        printk(" on CPU%d, ip %08lx, registers:\n",
+                smp_processor_id(), regs->ip);
         show_registers(regs);
         if (kexec_should_crash(current))
                 crash_kexec(regs);