diff options
| author | Gong Tao <gontao0607@gmail.com> | 2012-09-21 08:49:58 +0200 |
|---|---|---|
| committer | Jonas Bonn <jonas@southpole.se> | 2012-10-11 11:27:26 +0200 |
| commit | d23b5799b608112bb799c9b0e1e11ee1da692d76 (patch) | |
| tree | ef40a1d178d78827332b71af0384288ca262f6ac /arch/openrisc | |
| parent | openrisc: fix typos in comments and warnings (diff) | |
| download | linux-d23b5799b608112bb799c9b0e1e11ee1da692d76.tar.xz linux-d23b5799b608112bb799c9b0e1e11ee1da692d76.zip | |
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')
| -rw-r--r-- | arch/openrisc/kernel/irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 } |