diff options
| author | David S. Miller | 2009-03-27 23:37:57 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-03-27 23:37:57 +0100 |
| commit | 8ebaebca7e9d371d79088190990f95e95e225b6d (patch) | |
| tree | c6da30e6f7a2b98f20557d7d0ec78c0acb867b99 /arch | |
| parent | gianfar: Fix kfree(skb) (diff) | |
| parent | RDMA/nes: Fix mis-merge (diff) | |
| download | kernel-qcow2-linux-8ebaebca7e9d371d79088190990f95e95e225b6d.tar.gz kernel-qcow2-linux-8ebaebca7e9d371d79088190990f95e95e225b6d.tar.xz kernel-qcow2-linux-8ebaebca7e9d371d79088190990f95e95e225b6d.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/time_64.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index 642562d83ec4..4ee2e48c4b39 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -724,12 +724,14 @@ void timer_interrupt(int irq, struct pt_regs *regs) unsigned long tick_mask = tick_ops->softint_mask; int cpu = smp_processor_id(); struct clock_event_device *evt = &per_cpu(sparc64_events, cpu); + struct irq_desc *desc; clear_softint(tick_mask); irq_enter(); - kstat_this_cpu.irqs[0]++; + desc = irq_to_desc(0); + kstat_incr_irqs_this_cpu(0, desc); if (unlikely(!evt->event_handler)) { printk(KERN_WARNING |