---

yaml --- r: 135883 b: refs/heads/master c: e2ab3df h: refs/heads/master i: 135881: dec783f 135879: fab1ff7 v: v3
git-mirror · Mar 27, 2009 · 1aa4754 · 1aa4754
1 parent 8f53879
commit 1aa4754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be0ea69674ed95e1e98cb3687a241badc756d228
+refs/heads/master: e2ab3dff9d515ef69ac7c245b5ad1e348f2106be
diff --git a/trunk/arch/sparc/kernel/time_64.c b/trunk/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