diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-06-29 02:25:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 10:26:25 -0700 |
| commit | 98bb244b685eb2a297aa60fa2e5c0631f95828e1 (patch) | |
| tree | 468ab2cf22dc3b10d1bc48660360b908d24cabef /kernel | |
| parent | f210be198ddd3f54b17d4aa6e69b829f75f226e5 (diff) | |
[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/chip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 8736f2ca8a3..a99047a324e 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -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); |