Messages in this thread Patch in this message | | | Date | Sun, 12 Aug 2007 15:46:34 -0000 | From | Thomas Gleixner <> | Subject | [patch 1/3] genirq: cleanup mismerge artifact |
| |
commit 5a43a066b11ac2fe84cf67307f20b83bea390f83 genirq: Allow fasteoi handler to retrigger disabled interrupts
was erroneously applied to handle_level_irq(). This adds the irq retrigger / resend functionality to the level irq handler.
Revert the offending bits.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- kernel/irq/chip.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Index: linux-2.6/kernel/irq/chip.c =================================================================== --- linux-2.6.orig/kernel/irq/chip.c 2007-08-12 17:18:04.000000000 +0200 +++ linux-2.6/kernel/irq/chip.c 2007-08-12 17:18:04.000000000 +0200 @@ -352,13 +352,10 @@ handle_level_irq(unsigned int irq, struc * 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); --
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |