From 1479d880677fb875d999862eef65ba3f05b36f45 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 7 Feb 2011 01:24:07 +0100 Subject: [PATCH] --- yaml --- r: 234717 b: refs/heads/master c: a60a5dc2db3b08b3c2900614c43b1262410c2d8c h: refs/heads/master i: 234715: 1fc20c505dc8f2c6942acae68a339d54235cd647 v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 640f9cb3c9e4..c6452850e0fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7ae4de5c8ae8110556f0f9c7241093ef984605c +refs/heads/master: a60a5dc2db3b08b3c2900614c43b1262410c2d8c diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index a499ca5b11aa..3ccff4d55b39 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/kernel/irq/chip.c @@ -583,14 +583,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) /* Start handling the irq */ desc->irq_data.chip->irq_ack(&desc->irq_data); - /* Mark the IRQ currently in progress.*/ - desc->status |= IRQ_INPROGRESS; - do { - struct irqaction *action = desc->action; - irqreturn_t action_ret; - - if (unlikely(!action)) { + if (unlikely(!desc->action)) { mask_irq(desc); goto out_unlock; } @@ -606,16 +600,10 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) unmask_irq(desc); } - desc->status &= ~IRQ_PENDING; - raw_spin_unlock(&desc->lock); - action_ret = handle_IRQ_event(irq, action); - if (!noirqdebug) - note_interrupt(irq, desc, action_ret); - raw_spin_lock(&desc->lock); + handle_irq_event(desc); } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING); - desc->status &= ~IRQ_INPROGRESS; out_unlock: raw_spin_unlock(&desc->lock); }