Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2 files changed, 5 insertions, 3 deletions

diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 1c378d8e90c5..8ba064f08a6f 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -185,7 +185,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
                 for_each_online_cpu(j)
-                        seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+                        seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 #endif
                 seq_printf(p, " %9s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 2db3c2229b95..4ee2e48c4b39 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -36,10 +36,10 @@
 #include <linux/clocksource.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 
 #include <asm/oplib.h>
 #include <asm/timer.h>
-#include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/starfire.h>
@@ -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