diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-08-12 15:46:34 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 11:05:45 -0700 |
| commit | 496634217e5671ed876a0348e9f5b7165e830b20 (patch) | |
| tree | b7614ffeca67d328ec70d9d886c4ae63ce225f44 /kernel/irq | |
| parent | 963c6527e0a0e285736ad482b8142d098f9c2288 (diff) | |
| download | linux-496634217e5671ed876a0348e9f5b7165e830b20.tar.gz | |
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>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/chip.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 615ce97c6cfd..f1a73f0b54e7 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -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); |