[PATCH] x86-64: Increase NMI watchdog probing timeout
authorAndi Kleen <ak@suse.de>
Mon, 2 Apr 2007 10:14:12 +0000 (12:14 +0200)
committerAndi Kleen <andi@basil.nowhere.org>
Mon, 2 Apr 2007 10:14:12 +0000 (12:14 +0200)
A 4 core Opteron needs longer than 10 ticks for this.

Signed-off-by: Andi Kleen <ak@suse.de>
arch/i386/kernel/nmi.c
arch/x86_64/kernel/nmi.c

index 851f3b1c5b1ce53ba1f5b02956e939f97e1decd2..a98ba88a8c0ca04dc2385306b8697dea4a10b681 100644 (file)
@@ -328,7 +328,7 @@ static int __init check_nmi_watchdog(void)
        for_each_possible_cpu(cpu)
                prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
        local_irq_enable();
-       mdelay((10*1000)/nmi_hz); // wait 10 ticks
+       mdelay((20*1000)/nmi_hz); // wait 20 ticks
 
        for_each_possible_cpu(cpu) {
 #ifdef CONFIG_SMP
index 17cf2d6b5e99c4a053064127b5087dd104354ed4..a90996c27dc87c95844bf8d0e648734b71f587e9 100644 (file)
@@ -317,7 +317,7 @@ int __init check_nmi_watchdog (void)
        for (cpu = 0; cpu < NR_CPUS; cpu++)
                counts[cpu] = cpu_pda(cpu)->__nmi_count;
        local_irq_enable();
-       mdelay((10*1000)/nmi_hz); // wait 10 ticks
+       mdelay((20*1000)/nmi_hz); // wait 20 ticks
 
        for_each_online_cpu(cpu) {
                if (!per_cpu(nmi_watchdog_ctlblk, cpu).enabled)