aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-04-02 12:14:12 +0200
committerAndi Kleen <andi@basil.nowhere.org>2007-04-02 12:14:12 +0200
commit0fb2ebfcb5f0b1916ed5ff260ec953ef616fec7c (patch)
treef012819926b8f611c1dfd987ba29521642286622 /arch
parent89e07569e4e4e935b2cec18e9d94f131aecb2e40 (diff)
downloadkernel_samsung_espresso10-0fb2ebfcb5f0b1916ed5ff260ec953ef616fec7c.zip
kernel_samsung_espresso10-0fb2ebfcb5f0b1916ed5ff260ec953ef616fec7c.tar.gz
kernel_samsung_espresso10-0fb2ebfcb5f0b1916ed5ff260ec953ef616fec7c.tar.bz2
[PATCH] x86-64: Increase NMI watchdog probing timeout
A 4 core Opteron needs longer than 10 ticks for this. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/nmi.c2
-rw-r--r--arch/x86_64/kernel/nmi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 851f3b1..a98ba88 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -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
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 17cf2d6..a90996c 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -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)