From 1fc20c505dc8f2c6942acae68a339d54235cd647 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 7 Feb 2011 01:22:17 +0100 Subject: [PATCH] --- yaml --- r: 234715 b: refs/heads/master c: 1529866c63d789925de9b4250646d82d033e4b95 h: refs/heads/master i: 234713: 3503194f9c693a4a7582d5610d899c640d8570d2 234711: d8f503765ece3618274560b23a4f19d432daf158 v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index cc03a99c2143..f3b79a227849 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 107781e72192067b95a7d373bfa460434a13c6ae +refs/heads/master: 1529866c63d789925de9b4250646d82d033e4b95 diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index 809a03fe7e07..2d2ba4ace0ec 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/kernel/irq/chip.c @@ -479,9 +479,6 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc) void handle_level_irq(unsigned int irq, struct irq_desc *desc) { - struct irqaction *action; - irqreturn_t action_ret; - raw_spin_lock(&desc->lock); mask_ack_irq(desc); @@ -496,19 +493,10 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) * If its disabled or no action available * keep it masked and get out of here */ - action = desc->action; - if (unlikely(!action || (desc->status & IRQ_DISABLED))) + if (unlikely(!desc->action || (desc->status & IRQ_DISABLED))) goto out_unlock; - desc->status |= IRQ_INPROGRESS; - 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); if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT))) unmask_irq(desc);