diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-02 22:41:17 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 12:58:11 +0100 |
| commit | d78f8dd36b90626106ce19cb2e6828b0dc39447e (patch) | |
| tree | bf142bff631dda1f129dccd08cf162acac6df07c | |
| parent | genirq: Consolidate IRQ_DISABLED (diff) | |
| download | linux-d78f8dd36b90626106ce19cb2e6828b0dc39447e.tar.xz linux-d78f8dd36b90626106ce19cb2e6828b0dc39447e.zip | |
genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()
IRQ_MASKED is set in mask_ack_irq() anyway. Remove it from
handle_edge_irq() to allow simpler ab^HHreuse of that function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110202212551.918484270@linutronix.de>
| -rw-r--r-- | kernel/irq/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 43c62ca68c11..2c30b7844595 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) || !desc->action)) { if (!irq_check_poll(desc)) { - desc->status |= (IRQ_PENDING | IRQ_MASKED); + desc->status |= IRQ_PENDING; mask_ack_irq(desc); goto out_unlock; } |