1 files changed, 13 insertions, 3 deletions

diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 41bbffd9cc0e..a0b8943c8f11 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -12,13 +12,15 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
+#include <linux/irq.h>
+#include <linux/irqnr.h>
 #include <linux/module.h>
 #include <linux/param.h>
+#include <linux/percpu-defs.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/pm.h>
-#include <linux/irq.h>
 
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
@@ -98,6 +100,7 @@ int_ptr asic_mask_nr_tbl[DEC_MAX_ASIC_INTS][2] = {
         { { .i = ~0 }, { .p = asic_intr_unimplemented } },
 };
 int cpu_fpu_mask = DEC_CPU_IRQ_MASK(DEC_CPU_INR_FPU);
+int *fpu_kstat_irq;
 
 static struct irqaction ioirq = {
         .handler = no_action,
@@ -755,8 +758,15 @@ void __init arch_init_irq(void)
                 dec_interrupt[DEC_IRQ_HALT] = -1;
 
         /* Register board interrupts: FPU and cascade. */
-        if (dec_interrupt[DEC_IRQ_FPU] >= 0)
-                setup_irq(dec_interrupt[DEC_IRQ_FPU], &fpuirq);
+        if (dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {
+                struct irq_desc *desc_fpu;
+                int irq_fpu;
+
+                irq_fpu = dec_interrupt[DEC_IRQ_FPU];
+                setup_irq(irq_fpu, &fpuirq);
+                desc_fpu = irq_to_desc(irq_fpu);
+                fpu_kstat_irq = this_cpu_ptr(desc_fpu->kstat_irqs);
+        }
         if (dec_interrupt[DEC_IRQ_CASCADE] >= 0)
                 setup_irq(dec_interrupt[DEC_IRQ_CASCADE], &ioirq);