From 1ba41a3ce842ad209c4d406ffd5e670cac7c494c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 12 Aug 2007 15:46:34 +0000 Subject: [PATCH] --- yaml --- r: 63972 b: refs/heads/master c: 496634217e5671ed876a0348e9f5b7165e830b20 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7f55a98de43a..0cf95a39b877 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 963c6527e0a0e285736ad482b8142d098f9c2288 +refs/heads/master: 496634217e5671ed876a0348e9f5b7165e830b20 diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index 615ce97c6cfd..f1a73f0b54e7 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/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);