5 files changed, 9 insertions, 5 deletions

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index d2c1ab12425a..5f5af7d4c890 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -921,11 +921,13 @@ void ipi_decode(struct smtc_ipi *pipi)
         struct clock_event_device *cd;
         void *arg_copy = pipi->arg;
         int type_copy = pipi->type;
+        int irq = MIPS_CPU_IRQ_BASE + 1;
+
         smtc_ipi_nq(&freeIPIq, pipi);
         switch (type_copy) {
         case SMTC_CLOCK_TICK:
                 irq_enter();
-                kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + 1]++;
+                kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
                 cd = &per_cpu(mips_clockevent_device, cpu);
                 cd->event_handler(cd);
                 irq_exit();
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index f8b18af141a1..0ecd5fe9486e 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -155,7 +155,7 @@ static void indy_buserror_irq(void)
         int irq = SGI_BUSERR_IRQ;
 
         irq_enter();
-        kstat_this_cpu.irqs[irq]++;
+        kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
         ip22_be_interrupt(irq);
         irq_exit();
 }
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index 3dcb27ec0c53..c8f7d2328b24 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -122,7 +122,7 @@ void indy_8254timer_irq(void)
         char c;
 
         irq_enter();
-        kstat_this_cpu.irqs[irq]++;
+        kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
         printk(KERN_ALERT "Oops, got 8254 interrupt.\n");
         ArcRead(0, &c, 1, &cnt);
         ArcEnterInteractiveMode();
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index dddfda8e8294..314691648c97 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -178,9 +178,10 @@ struct plat_smp_ops bcm1480_smp_ops = {
 void bcm1480_mailbox_interrupt(void)
 {
         int cpu = smp_processor_id();
+        int irq = K_BCM1480_INT_MBOX_0_0;
         unsigned int action;
 
-        kstat_this_cpu.irqs[K_BCM1480_INT_MBOX_0_0]++;
+        kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
         /* Load the mailbox register to figure out what we're supposed to do */
         action = (__raw_readq(mailbox_0_regs[cpu]) >> 48) & 0xffff;
 
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index 5950a288a7da..cad14003b84f 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -166,9 +166,10 @@ struct plat_smp_ops sb_smp_ops = {
 void sb1250_mailbox_interrupt(void)
 {
         int cpu = smp_processor_id();
+        int irq = K_INT_MBOX_0;
         unsigned int action;
 
-        kstat_this_cpu.irqs[K_INT_MBOX_0]++;
+        kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
         /* Load the mailbox register to figure out what we're supposed to do */
         action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff;