From 9edee83c3548597ab11f3380359d7b4588d8c5cf Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 2 Feb 2011 21:41:17 +0000
Subject: [PATCH] --- yaml --- r: 234712 b: refs/heads/master c:
 d78f8dd36b90626106ce19cb2e6828b0dc39447e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 51d7b7704b20..f7581cfa2baf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aae994fb0f43f6d94a31c33536a83869504abdf
+refs/heads/master: d78f8dd36b90626106ce19cb2e6828b0dc39447e
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 43c62ca68c11..2c30b7844595 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 	if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
 		    !desc->action)) {
 		if (!irq_check_poll(desc)) {
-			desc->status |= (IRQ_PENDING | IRQ_MASKED);
+			desc->status |= IRQ_PENDING;
 			mask_ack_irq(desc);
 			goto out_unlock;
 		}