---

yaml --- r: 234715 b: refs/heads/master c: 1529866 h: refs/heads/master i: 234713: 3503194 234711: d8f5037 v: v3
git-mirror · Feb 19, 2011 · 1fc20c5 · 1fc20c5
1 parent 9eaeb2c
commit 1fc20c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git 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
@@ -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);