From 888ca289649e62921120f59199302252e6d98950 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 27 Aug 2009 09:38:49 +0200
Subject: [PATCH] --- yaml --- r: 158187 b: refs/heads/master c:
 4dbc9ca219b0f294332e734528f7b82211700170 h: refs/heads/master i:   158185:
 21c1792bc357fb5818f6b70ca122598cb33bd7e4   158183:
 063e138c2abd9f1e4906340e9bbf22616bb1ccc9 v: v3

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

diff --git a/[refs] b/[refs]
index 22249f21b4b0..c0f93164e4ef 100644
--- 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
index 5765aad94998..c1660194d115 100644
--- 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;