commit 2187f82a5121587cc1c0e4774d6d84d9cdd0a1d6
author Allan Zhang <allanzhang@google.com> Thu Jun 04 23:17:15 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 04 23:17:16 2015 +0000
tree 94d45015e391df41ab24793ad0a433830c413f1f
parent f2a2062fe0d213f5a7e8c1ffb256279050ac26dd
parent 0b7ffeffdba6ffbf36b29ae6114b66dabaa4e668

Merge "Mips IRQ disable/enable fix."

arch/mips/kernel/irq_cpu.c

diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 191eb52..3742593 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -56,6 +56,8 @@
 	.irq_mask_ack	= mask_mips_irq,
 	.irq_unmask	= unmask_mips_irq,
 	.irq_eoi	= unmask_mips_irq,
+	.irq_disable    = mask_mips_irq,
+	.irq_enable     = unmask_mips_irq,
 };
 
 /*
@@ -92,6 +94,8 @@
 	.irq_mask_ack	= mips_mt_cpu_irq_ack,
 	.irq_unmask	= unmask_mips_irq,
 	.irq_eoi	= unmask_mips_irq,
+	.irq_disable    = mask_mips_irq,
+	.irq_enable     = unmask_mips_irq,
 };
 
 void __init mips_cpu_irq_init(void)