1 files changed, 18 insertions, 0 deletions

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 3dd76b3d2967..3dce742e716f 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -38,6 +38,15 @@ void ack_bad_irq(unsigned int irq)
 
 atomic_t irq_err_count;
 
+#ifdef CONFIG_MIPS_MT_SMTC
+/*
+ * SMTC Kernel needs to manipulate low-level CPU interrupt mask
+ * in do_IRQ. These are passed in setup_irq_smtc() and stored
+ * in this table.
+ */
+unsigned long irq_hwmask[NR_IRQS];
+#endif /* CONFIG_MIPS_MT_SMTC */
+
 #undef do_IRQ
 
 /*
@@ -49,6 +58,7 @@ asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
         irq_enter();
 
+        __DO_IRQ_SMTC_HOOK();
         __do_IRQ(irq, regs);
 
         irq_exit();
@@ -101,6 +111,11 @@ skip:
         return 0;
 }
 
+asmlinkage void spurious_interrupt(struct pt_regs *regs)
+{
+        atomic_inc(&irq_err_count);
+}
+
 #ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern void set_debug_traps(void);
@@ -124,6 +139,9 @@ void __init init_IRQ(void)
                 irq_desc[i].depth   = 1;
                 irq_desc[i].handler = &no_irq_type;
                 spin_lock_init(&irq_desc[i].lock);
+#ifdef CONFIG_MIPS_MT_SMTC
+                irq_hwmask[i] = 0;
+#endif /* CONFIG_MIPS_MT_SMTC */
         }
 
         arch_init_irq();