From c57440a2b1f5872ac8e67f17412c5bb2757334b1 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 7 Feb 2011 01:23:07 +0100 Subject: [PATCH] --- yaml --- r: 234716 b: refs/heads/master c: a7ae4de5c8ae8110556f0f9c7241093ef984605c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index f3b79a227849..640f9cb3c9e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1529866c63d789925de9b4250646d82d033e4b95 +refs/heads/master: a7ae4de5c8ae8110556f0f9c7241093ef984605c diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index 2d2ba4ace0ec..a499ca5b11aa 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/kernel/irq/chip.c @@ -518,9 +518,6 @@ EXPORT_SYMBOL_GPL(handle_level_irq); void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) { - struct irqaction *action; - irqreturn_t action_ret; - raw_spin_lock(&desc->lock); if (unlikely(desc->status & IRQ_INPROGRESS)) @@ -534,26 +531,14 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) * If its disabled or no action available * then mask it and get out of here: */ - action = desc->action; - if (unlikely(!action || (desc->status & IRQ_DISABLED))) { + if (unlikely(!desc->action || (desc->status & IRQ_DISABLED))) { desc->status |= IRQ_PENDING; mask_irq(desc); goto out; } - - desc->status |= IRQ_INPROGRESS; - 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); - desc->status &= ~IRQ_INPROGRESS; + handle_irq_event(desc); out: desc->irq_data.chip->irq_eoi(&desc->irq_data); - raw_spin_unlock(&desc->lock); }