From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 29 Jun 2006 09:25:01 +0000 (-0700)
Subject: [PATCH] genirq: fasteoi handler: handle interrupt disabling
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98bb244b685eb2a297aa60fa2e5c0631f95828e1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[PATCH] genirq: fasteoi handler: handle interrupt disabling

Note when a disable interrupt happened with the fasteoi handler as well so
that delayed disable can be implemented with fasteoi-type controllers.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 8736f2ca8a3b..a99047a324eb 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -311,10 +311,13 @@ handle_fastack_irq(unsigned int irq, struct irq_desc *desc,
 	 * keep it masked and get out of here
 	 */
 	action = desc->action;
-	if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+	if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
+		desc->status |= IRQ_PENDING;
 		goto out;
+	}
 
 	desc->status |= IRQ_INPROGRESS;
+	desc->status &= ~IRQ_PENDING;
 	spin_unlock(&desc->lock);
 
 	action_ret = handle_IRQ_event(irq, regs, action);