From: Gong Tao <gontao0607@gmail.com>
Date: Fri, 21 Sep 2012 06:49:58 +0000 (+0200)
Subject: openrisc: mask interrupts in irq_mask_ack function
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d23b5799b608112bb799c9b0e1e11ee1da692d76;p=linux-beck.git

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>
---

diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index 61327985f967..8ec77bc9f1e7 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -87,9 +87,11 @@ static void or1k_pic_mask_ack(struct irq_data *data)
 	/* 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
 }