Commit 15636668 authored by Aristeu Rozanski's avatar Aristeu Rozanski Committed by Ingo Molnar

x86, NMI: fix watchdog failure message

> it just won't work at boot time - the second logic unit will be stuck:
>
> Booting processor 1/2 APIC 0x1
> Initializing CPU#1
> Calibrating delay using timer specific routine.. 5586.12 BogoMIPS (lpj=2793063)
> CPU: Trace cache: 12K uops, L1 D cache: 16K
> CPU: L2 cache: 1024K
> CPU: Physical Processor ID: 0
> CPU: Processor Core ID: 1
> CPU1: Thermal monitoring enabled (TM1)
>               Intel(R) Pentium(R) D CPU 2.80GHz stepping 04
> Brought up 2 CPUs
> testing NMI watchdog ... <4>WARNING: CPU#1: NMI appears to be stuck (0->0)!

while at it... - fix that newline
Signed-off-by: default avatarAristeu Rozanski <aris@redhat.com>
Cc: jvillalo@redhat.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a06de630
...@@ -142,11 +142,15 @@ int __init check_nmi_watchdog(void) ...@@ -142,11 +142,15 @@ int __init check_nmi_watchdog(void)
if (!per_cpu(wd_enabled, cpu)) if (!per_cpu(wd_enabled, cpu))
continue; continue;
if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) { if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
printk("\n");
printk(KERN_WARNING "WARNING: CPU#%d: NMI " printk(KERN_WARNING "WARNING: CPU#%d: NMI "
"appears to be stuck (%d->%d)!\n", "appears to be stuck (%d->%d)!\n",
cpu, cpu,
prev_nmi_count[cpu], prev_nmi_count[cpu],
get_nmi_count(cpu)); get_nmi_count(cpu));
printk(KERN_WARNING "Please report this to "
"linux-kernel@vger.kernel.org and attach "
"the output of 'dmesg' command.\n");
per_cpu(wd_enabled, cpu) = 0; per_cpu(wd_enabled, cpu) = 0;
atomic_dec(&nmi_active); atomic_dec(&nmi_active);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment