---

yaml --- r: 31861 b: refs/heads/master c: 5a43a06 h: refs/heads/master i: 31859: 81b1566 v: v3
git-mirror · Jul 3, 2006 · e953f89 · e953f89
1 parent 8d1a793
commit e953f89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e9a69275f23baec86b54febc5dad0b2fc7fb200
+refs/heads/master: 5a43a066b11ac2fe84cf67307f20b83bea390f83
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -261,10 +261,13 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 	 * keep it masked and get out of here
 	 */
 	action = desc->action;
-	if (unlikely(!action || (desc->status & IRQ_DISABLED)))
+	if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
+		desc->status |= IRQ_PENDING;
 		goto out;
+	}
 
 	desc->status |= IRQ_INPROGRESS;
+	desc->status &= ~IRQ_PENDING;
 	spin_unlock(&desc->lock);
 
 	action_ret = handle_IRQ_event(irq, regs, action);