Skip to content

GitLab

"...android_kernel_samsung_matisse.git" did not exist on "0b0c940a91f8e6fd0e1be3e01d5e98997446233b"
Commit 0fb2ebfc authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86-64: Increase NMI watchdog probing timeout 


A 4 core Opteron needs longer than 10 ticks for this.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 89e07569
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/i386/kernel/nmi.c
View file @ 0fb2ebfc
...@@ -328,7 +328,7 @@ static int __init check_nmi_watchdog(void) ...@@ -328,7 +328,7 @@ static int __init check_nmi_watchdog(void)
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count; prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
local_irq_enable(); local_irq_enable();
mdelay((10*1000)/nmi_hz); // wait 10 ticks mdelay((20*1000)/nmi_hz); // wait 20 ticks
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
arch/x86_64/kernel/nmi.c
View file @ 0fb2ebfc
...@@ -317,7 +317,7 @@ int __init check_nmi_watchdog (void) ...@@ -317,7 +317,7 @@ int __init check_nmi_watchdog (void)
for (cpu = 0; cpu < NR_CPUS; cpu++) for (cpu = 0; cpu < NR_CPUS; cpu++)
counts[cpu] = cpu_pda(cpu)->__nmi_count; counts[cpu] = cpu_pda(cpu)->__nmi_count;
local_irq_enable(); local_irq_enable();
mdelay((10*1000)/nmi_hz); // wait 10 ticks mdelay((20*1000)/nmi_hz); // wait 20 ticks
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
if (!per_cpu(nmi_watchdog_ctlblk, cpu).enabled) if (!per_cpu(nmi_watchdog_ctlblk, cpu).enabled)
......
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