[PATCH] genirq: fasteoi handler: handle interrupt disabling
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 29 Jun 2006 09:25:01 +0000 (02:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Jun 2006 17:26:25 +0000 (10:26 -0700)
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>
kernel/irq/chip.c

index 8736f2ca8a3bca6d07f5dc768fb801efe5cb1878..a99047a324eb94cb1eb8de355592c369952c2f29 100644 (file)
@@ -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);