From: Keith Owens Date: Sun, 22 Jul 2007 09:12:36 +0000 (+0200) Subject: i386: Do not include other cpus' interrupt 0 in nmi_watchdog X-Git-Tag: v2.6.23-rc1~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=20fe1d30e7e1c2ee36f11856f090613b0ad58b48;p=linux-2.6-omap-h63xx.git i386: Do not include other cpus' interrupt 0 in nmi_watchdog 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 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 03b7f5584d7..99beac7f96c 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -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 * 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 (!touched && last_irq_sums[cpu] == sum) {