aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAristeu Rozanski <arozansk@redhat.com>2008-08-15 08:36:14 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-15 09:34:59 -0400
commit15636668449d4135ac77a79715ba430a81aed16d (patch)
tree4a74e37873c870fdf6300832ad7d154666f1043a /arch/x86
parenta06de63000b95e1ed1c6373a72376876c952608e (diff)
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: Aristeu Rozanski <aris@redhat.com> Cc: jvillalo@redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/nmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index ac6d51222e7d..919473ad4a29 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -142,11 +142,15 @@ int __init check_nmi_watchdog(void)
142 if (!per_cpu(wd_enabled, cpu)) 142 if (!per_cpu(wd_enabled, cpu))
143 continue; 143 continue;
144 if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) { 144 if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
145 printk("\n");
145 printk(KERN_WARNING "WARNING: CPU#%d: NMI " 146 printk(KERN_WARNING "WARNING: CPU#%d: NMI "
146 "appears to be stuck (%d->%d)!\n", 147 "appears to be stuck (%d->%d)!\n",
147 cpu, 148 cpu,
148 prev_nmi_count[cpu], 149 prev_nmi_count[cpu],
149 get_nmi_count(cpu)); 150 get_nmi_count(cpu));
151 printk(KERN_WARNING "Please report this to "
152 "linux-kernel@vger.kernel.org and attach "
153 "the output of 'dmesg' command.\n");
150 per_cpu(wd_enabled, cpu) = 0; 154 per_cpu(wd_enabled, cpu) = 0;
151 atomic_dec(&nmi_active); 155 atomic_dec(&nmi_active);
152 } 156 }