aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-02-23 16:40:14 -0500
committerThomas Gleixner <tglx@linutronix.de>2014-03-04 11:37:53 -0500
commit310ff2c87e72208e4f04f33687abe9d208ffefe3 (patch)
treed4ab6b1f906f40bec55bebea76c4e37db94ef888
parent792d0018a5fe31ef8ef9d07a7a02081d4abdf6b7 (diff)
mips: Use the core irq stats function
Let the core do the irq_desc resolution. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: mips <inux-mips@linux-mips.org> Link: http://lkml.kernel.org/r/20140223212737.517340416@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/mips/kernel/smtc.c2
-rw-r--r--arch/mips/sgi-ip22/ip22-int.c2
-rw-r--r--arch/mips/sgi-ip22/ip22-time.c2
-rw-r--r--arch/mips/sibyte/bcm1480/smp.c2
-rw-r--r--arch/mips/sibyte/sb1250/smp.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index dfc1b911be04..c1681d65dd5c 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1007,7 +1007,7 @@ static void __irq_entry smtc_clock_tick_interrupt(void)
1007 int irq = MIPS_CPU_IRQ_BASE + 1; 1007 int irq = MIPS_CPU_IRQ_BASE + 1;
1008 1008
1009 irq_enter(); 1009 irq_enter();
1010 kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); 1010 kstat_incr_irq_this_cpu(irq);
1011 cd = &per_cpu(mips_clockevent_device, cpu); 1011 cd = &per_cpu(mips_clockevent_device, cpu);
1012 cd->event_handler(cd); 1012 cd->event_handler(cd);
1013 irq_exit(); 1013 irq_exit();
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index 3db64d51798d..58b40ae59335 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -148,7 +148,7 @@ static void __irq_entry indy_buserror_irq(void)
148 int irq = SGI_BUSERR_IRQ; 148 int irq = SGI_BUSERR_IRQ;
149 149
150 irq_enter(); 150 irq_enter();
151 kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); 151 kstat_incr_irq_this_cpu(irq);
152 ip22_be_interrupt(irq); 152 ip22_be_interrupt(irq);
153 irq_exit(); 153 irq_exit();
154} 154}
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index 607192449335..045aa89f28d8 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -123,7 +123,7 @@ void __irq_entry indy_8254timer_irq(void)
123 char c; 123 char c;
124 124
125 irq_enter(); 125 irq_enter();
126 kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); 126 kstat_incr_irq_this_cpu(irq);
127 printk(KERN_ALERT "Oops, got 8254 interrupt.\n"); 127 printk(KERN_ALERT "Oops, got 8254 interrupt.\n");
128 ArcRead(0, &c, 1, &cnt); 128 ArcRead(0, &c, 1, &cnt);
129 ArcEnterInteractiveMode(); 129 ArcEnterInteractiveMode();
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 54e2c4de15c1..70d9182b26f1 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -182,7 +182,7 @@ void bcm1480_mailbox_interrupt(void)
182 int irq = K_BCM1480_INT_MBOX_0_0; 182 int irq = K_BCM1480_INT_MBOX_0_0;
183 unsigned int action; 183 unsigned int action;
184 184
185 kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); 185 kstat_incr_irq_this_cpu(irq);
186 /* Load the mailbox register to figure out what we're supposed to do */ 186 /* Load the mailbox register to figure out what we're supposed to do */
187 action = (__raw_readq(mailbox_0_regs[cpu]) >> 48) & 0xffff; 187 action = (__raw_readq(mailbox_0_regs[cpu]) >> 48) & 0xffff;
188 188
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index d7b942db0ea5..db976117dd4d 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -170,7 +170,7 @@ void sb1250_mailbox_interrupt(void)
170 int irq = K_INT_MBOX_0; 170 int irq = K_INT_MBOX_0;
171 unsigned int action; 171 unsigned int action;
172 172
173 kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); 173 kstat_incr_irq_this_cpu(irq);
174 /* Load the mailbox register to figure out what we're supposed to do */ 174 /* Load the mailbox register to figure out what we're supposed to do */
175 action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff; 175 action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
176 176