tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

genirq: cleanup mismerge artifact

Commit 5a43a066b11ac2fe84cf67307f20b83bea390f83: "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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Thomas Gleixner and committed by
Linus Torvalds 49663421 963c6527

+1 -4
+1 -4
kernel/irq/chip.c
··· 352 352 * keep it masked and get out of here 353 353 */ 354 354 action = desc->action; 355 - if (unlikely(!action || (desc->status & IRQ_DISABLED))) { 356 - desc->status |= IRQ_PENDING; 355 + if (unlikely(!action || (desc->status & IRQ_DISABLED))) 357 356 goto out_unlock; 358 - } 359 357 360 358 desc->status |= IRQ_INPROGRESS; 361 - desc->status &= ~IRQ_PENDING; 362 359 spin_unlock(&desc->lock); 363 360 364 361 action_ret = handle_IRQ_event(irq, action);