lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i386: Do not include other cpus' interrupt 0 in nmi_watchdog

Browse Source 
kstat_irqs(0) includes the count of interrupt 0 from all cpus, not just
the current cpu.  The updated interrupt 0 on other cpus can stop the
nmi_watchdog from tripping, so only include the current cpu's int 0.

Signed-off-by: Keith Owens <kaos@ocs.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Keith Owens
2007-07-22 11:12:36 +02:00
committed by Linus Torvalds
parent 398cf2abdb
commit 20fe1d30e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/nmi.c
View File

@@ -353,7 +353,7 @@ __kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
* Take the local apic timer and PIT/HPET into account. We don't * Take the local apic timer and PIT/HPET into account. We don't
* know which one is active, when we have highres/dyntick on * know which one is active, when we have highres/dyntick on
*/ */
sum = per_cpu(irq_stat, cpu).apic_timer_irqs + kstat_irqs(0); sum = per_cpu(irq_stat, cpu).apic_timer_irqs + kstat_cpu(cpu).irqs[0];
/* if the none of the timers isn't firing, this cpu isn't doing much */ /* if the none of the timers isn't firing, this cpu isn't doing much */
if (!touched && last_irq_sums[cpu] == sum) { if (!touched && last_irq_sums[cpu] == sum) {