commit d23b5799b608112bb799c9b0e1e11ee1da692d76
author Gong Tao <gontao0607@gmail.com> Fri Sep 21 08:49:58 2012 +0200
committer Jonas Bonn <jonas@southpole.se> Thu Oct 11 11:27:26 2012 +0200
tree ef40a1d178d78827332b71af0384288ca262f6ac
parent 8eea8a6a9a2af067bd3006f7fefab66a4fb66451

openrisc: mask interrupts in irq_mask_ack function

or1k_pic_mask_ack was failing to actually mask the IRQ.

Signed-off-by: Gong Tao <gongtao0607@gmail.com>
Signed-off-by: Jonas Bonn <jonas@southpole.se>

arch/openrisc/kernel/irq.c

diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index 6132798..8ec77bc 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -87,9 +87,11 @@
 	/* Comments for pic_ack apply here, too */
 
 #ifdef CONFIG_OR1K_1200
+	mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
 	mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
 #else
 	WARN(1, "Interrupt handling possibly broken\n");
+	mtspr(SPR_PICMR, (1UL << data->hwirq));
 	mtspr(SPR_PICSR, (1UL << data->hwirq));
 #endif
 }