diff options
| author | Andi Kleen <ak@suse.de> | 2007-04-02 06:14:12 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-04-02 06:14:12 -0400 |
| commit | 0fb2ebfcb5f0b1916ed5ff260ec953ef616fec7c (patch) | |
| tree | f012819926b8f611c1dfd987ba29521642286622 /arch/x86_64 | |
| parent | 89e07569e4e4e935b2cec18e9d94f131aecb2e40 (diff) | |
[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/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 17cf2d6b5e99..a90996c27dc8 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) | |||
| 317 | for (cpu = 0; cpu < NR_CPUS; cpu++) | 317 | for (cpu = 0; cpu < NR_CPUS; cpu++) |
| 318 | counts[cpu] = cpu_pda(cpu)->__nmi_count; | 318 | counts[cpu] = cpu_pda(cpu)->__nmi_count; |
| 319 | local_irq_enable(); | 319 | local_irq_enable(); |
| 320 | mdelay((10*1000)/nmi_hz); // wait 10 ticks | 320 | mdelay((20*1000)/nmi_hz); // wait 20 ticks |
| 321 | 321 | ||
| 322 | for_each_online_cpu(cpu) { | 322 | for_each_online_cpu(cpu) { |
| 323 | if (!per_cpu(nmi_watchdog_ctlblk, cpu).enabled) | 323 | if (!per_cpu(nmi_watchdog_ctlblk, cpu).enabled) |