---

yaml --- r: 344401 b: refs/heads/master c: 7958a68 h: refs/heads/master i: 344399: f7faea7 v: v3
git-mirror · Dec 13, 2012 · 2c2bf3c · 2c2bf3c
1 parent 0b172cc
commit 2c2bf3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b881e99eeadcc5a6194e225ba3986fde545469d3
+refs/heads/master: 7958a689199fbc557fad7d79b16b2017a7e40a71
diff --git a/trunk/arch/microblaze/kernel/intc.c b/trunk/arch/microblaze/kernel/intc.c
@@ -44,14 +44,15 @@ static void intc_enable_or_unmask(struct irq_data *d)
 	unsigned long mask = 1 << d->hwirq;
 
 	pr_debug("enable_or_unmask: %ld\n", d->hwirq);
-	out_be32(INTC_BASE + SIE, mask);
 
 	/* ack level irqs because they can't be acked during
 	 * ack function since the handle_level_irq function
 	 * acks the irq before calling the interrupt handler
 	 */
 	if (irqd_is_level_type(d))
 		out_be32(INTC_BASE + IAR, mask);
+
+	out_be32(INTC_BASE + SIE, mask);
 }
 
 static void intc_disable_or_mask(struct irq_data *d)