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);