From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 12 Aug 2007 15:46:34 +0000 (+0000)
Subject: genirq: cleanup mismerge artifact
X-Git-Tag: v2.6.23-rc3~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=496634217e5671ed876a0348e9f5b7165e830b20;p=~shefty%2Frdma-dev.git

genirq: cleanup mismerge artifact

Commit 5a43a066b11ac2fe84cf67307f20b83bea390f83: "genirq: Allow fasteoi
handler to retrigger disabled interrupts" was erroneously applied to
handle_level_irq().  This added the irq retrigger / resend functionality
to the level irq handler.

Revert the offending bits.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 615ce97c6cf..f1a73f0b54e 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -352,13 +352,10 @@ handle_level_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))) {
-		desc->status |= IRQ_PENDING;
+	if (unlikely(!action || (desc->status & IRQ_DISABLED)))
 		goto out_unlock;
-	}
 
 	desc->status |= IRQ_INPROGRESS;
-	desc->status &= ~IRQ_PENDING;
 	spin_unlock(&desc->lock);
 
 	action_ret = handle_IRQ_event(irq, action);