From 0e2ef83a87448057369eedec2cc34ea2f7d11648 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Sat, 24 May 2008 19:36:32 +0400 Subject: [PATCH] --- yaml --- r: 99803 b: refs/heads/master c: e56b3a12c45e439169f2d1f7194be397667320a6 h: refs/heads/master i: 99801: 545b318336b3996fb5a4e07fc597fcc2468a17c8 99799: ded8cbd8fd0065cb14fc7913fddc5d2c62eaafb5 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/nmi_64.c | 4 ++-- trunk/arch/x86/kernel/traps_64.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bcccb05d7e15..3edd0388d8bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddca03c98a7f7ad5ab09967ff52d4ed60358c896 +refs/heads/master: e56b3a12c45e439169f2d1f7194be397667320a6 diff --git a/trunk/arch/x86/kernel/nmi_64.c b/trunk/arch/x86/kernel/nmi_64.c index 33cb8ecbb6dd..1a98705270a2 100644 --- a/trunk/arch/x86/kernel/nmi_64.c +++ b/trunk/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/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c index adff76ea97c4..6a048ce3c787 100644 --- a/trunk/arch/x86/kernel/traps_64.c +++ b/trunk/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);