From 26384d0a65be84b5bbe9d7b0f3e2b5fea17a9f1b Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 2 Mar 2011 11:49:21 +0100
Subject: [PATCH] --- yaml --- r: 234773 b: refs/heads/master c:
 c69e3758ff56d03e161187355791ec992c574276 h: refs/heads/master i:   234771:
 5351c544bf7f2f767a41f4ab842fc0dadedfa1ce v: v3

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

diff --git a/[refs] b/[refs]
index 45cbb4c755e9..9c8f47140a9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d32a307e4faa8b123dc8a9cd56d1a7525f69ad3
+refs/heads/master: c69e3758ff56d03e161187355791ec992c574276
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index b5145654855f..c9c0601f0615 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -513,6 +513,10 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 		mask_irq(desc);
 		goto out;
 	}
+
+	if (desc->istate & IRQS_ONESHOT)
+		mask_irq(desc);
+
 	preflow_handler(desc);
 	handle_irq_event(desc);