Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98bb244b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f210be19

kernel/irq/chip.c

+4 −1
Original line number Diff line number Diff line
@@ -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);