aboutsummaryrefslogtreecommitdiff
path: root/arch/openrisc/kernel
diff options
context:
space:
mode:
authorGong Tao <gontao0607@gmail.com>2012-09-21 08:49:58 +0200
committerJonas Bonn <jonas@southpole.se>2012-10-11 11:27:26 +0200
commitd23b5799b608112bb799c9b0e1e11ee1da692d76 (patch)
treeef40a1d178d78827332b71af0384288ca262f6ac /arch/openrisc/kernel
parent8eea8a6a9a2af067bd3006f7fefab66a4fb66451 (diff)
downloadlinux-d23b5799b608112bb799c9b0e1e11ee1da692d76.tar.gz
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>
Diffstat (limited to 'arch/openrisc/kernel')
-rw-r--r--arch/openrisc/kernel/irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index 61327985f96..8ec77bc9f1e 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
}