From b4d3bd53b302b23da7b567f2b46b51596891b5ce Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 29 Jun 2006 02:25:01 -0700
Subject: [PATCH] --- yaml --- r: 31083 b: refs/heads/master c:
 98bb244b685eb2a297aa60fa2e5c0631f95828e1 h: refs/heads/master i:   31081:
 21c10fef68919494e9a3e38984f56eb13810e08a   31079:
 e468bb60f33eba52ae9a9850c7d5de26c3a18f77 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/irq/chip.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 623c6dacb704..36df7df45c48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f210be198ddd3f54b17d4aa6e69b829f75f226e5
+refs/heads/master: 98bb244b685eb2a297aa60fa2e5c0631f95828e1
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 8736f2ca8a3b..a99047a324eb 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -311,10 +311,13 @@ handle_fastack_irq(unsigned int irq, struct irq_desc *desc,
 	 * 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);