From 24333b43367424194829a0dd8fff7c55b83b8456 Mon Sep 17 00:00:00 2001 From: Gong Tao Date: Fri, 21 Sep 2012 08:49:58 +0200 Subject: [PATCH] --- yaml --- r: 334192 b: refs/heads/master c: d23b5799b608112bb799c9b0e1e11ee1da692d76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/openrisc/kernel/irq.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e2c9dba5189..e6f511a4fd9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eea8a6a9a2af067bd3006f7fefab66a4fb66451 +refs/heads/master: d23b5799b608112bb799c9b0e1e11ee1da692d76 diff --git a/trunk/arch/openrisc/kernel/irq.c b/trunk/arch/openrisc/kernel/irq.c index 61327985f967..8ec77bc9f1e7 100644 --- a/trunk/arch/openrisc/kernel/irq.c +++ b/trunk/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 }