---

yaml --- r: 158187 b: refs/heads/master c: 4dbc9ca h: refs/heads/master i: 158185: 21c1792 158183: 063e138 v: v3
git-mirror · Aug 27, 2009 · 888ca28 · 888ca28
1 parent 1f05ff0
commit 888ca28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 399b5da29b9f851eb7b96e2882097127f003e87c
+refs/heads/master: 4dbc9ca219b0f294332e734528f7b82211700170
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -548,13 +548,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 	kstat_incr_irqs_this_cpu(irq, desc);
 
 	/* Start handling the irq */
-	if (unlikely(desc->status & IRQ_ONESHOT)) {
-		desc->status |= IRQ_MASKED;
-		mask_ack_irq(desc, irq);
-	} else {
-		if (desc->chip->ack)
-			desc->chip->ack(irq);
-	}
+	if (desc->chip->ack)
+		desc->chip->ack(irq);
 
 	/* Mark the IRQ currently in progress.*/
 	desc->status |= IRQ_INPROGRESS;