diff options
| author | Ingo Molnar | 2009-03-13 17:08:30 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-13 17:08:30 +0100 |
| commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
| tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /arch/mn10300 | |
| parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-watchdog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-watchdog.c b/arch/mn10300/kernel/mn10300-watchdog.c index 10811e981d20..2e370d88a87a 100644 --- a/arch/mn10300/kernel/mn10300-watchdog.c +++ b/arch/mn10300/kernel/mn10300-watchdog.c @@ -130,6 +130,7 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep) * the stack NMI-atomically, it's safe to use smp_processor_id(). */ int sum, cpu = smp_processor_id(); + int irq = NMIIRQ; u8 wdt, tmp; wdt = WDCTR & ~WDCTR_WDCNE; @@ -138,7 +139,7 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep) NMICR = NMICR_WDIF; nmi_count(cpu)++; - kstat_this_cpu.irqs[NMIIRQ]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); sum = irq_stat[cpu].__irq_count; if (last_irq_sums[cpu] == sum) { |