Merge branch 'master'

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index b974ac9057f6..2125ba5f1d9b 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -187,6 +187,10 @@ handle_real_irq:
                 outb(cached_21,0x21);
                 outb(0x60+irq,0x20);    /* 'Specific EOI' to master */
         }
+#ifdef CONFIG_MIPS_MT_SMTC
+        if (irq_hwmask[irq] & ST0_IM)
+                set_c0_status(irq_hwmask[irq] & ST0_IM);
+#endif /* CONFIG_MIPS_MT_SMTC */
         spin_unlock_irqrestore(&i8259A_lock, flags);
         return;