Commit:     20fe1d30e7e1c2ee36f11856f090613b0ad58b48
Parent:     398cf2abdb51fc96bc08f2a007b1aa25ba6adfba
Author:     Keith Owens <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 11:12:36 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Jul 22 11:03:38 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/kernel/nmi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 03b7f55..99beac7 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) {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to