aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-27 15:37:57 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-27 15:37:57 -0700
commit8ebaebca7e9d371d79088190990f95e95e225b6d (patch)
treec6da30e6f7a2b98f20557d7d0ec78c0acb867b99 /arch
parentbd14ba842cd29edbbd40e566194bd33cf0c92f6c (diff)
parent7c757eb9f804782fb39d0ae2c1a88ffb9309138e (diff)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/time_64.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 642562d83ec..4ee2e48c4b3 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