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

Commit 49663421 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

genirq: cleanup mismerge artifact 



Commit 5a43a066: "genirq: Allow fasteoi
handler to retrigger disabled interrupts" was erroneously applied to
handle_level_irq().  This added the irq retrigger / resend functionality
to the level irq handler.

Revert the offending bits.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 963c6527

kernel/irq/chip.c

+1 −4
Original line number Diff line number Diff line
@@ -352,13 +352,10 @@ handle_level_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))) {

		desc->status |= IRQ_PENDING;

	if (unlikely(!action || (desc->status & IRQ_DISABLED)))

		goto out_unlock;

	}



	desc->status |= IRQ_INPROGRESS;

	desc->status &= ~IRQ_PENDING;

	spin_unlock(&desc->lock);



	action_ret = handle_IRQ_event(irq, action);