From 1aa475491620a5e3a3af2efed9dcc0505c525808 Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 26 Mar 2009 16:44:17 -0700 Subject: [PATCH] --- yaml --- r: 135883 b: refs/heads/master c: e2ab3dff9d515ef69ac7c245b5ad1e348f2106be h: refs/heads/master i: 135881: dec783f97db95084c3609c9bac6ccb4b5c070487 135879: fab1ff742e531b2bbb3c7cf81470d6de4f4fb44c v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/time_64.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91196e53ee73..bb5cbbf2198d 100644 --- 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 index 642562d83ec4..4ee2e48c4b39 100644 --- 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