From af7d44d00b2c14d1c962c0d847a0fbd177ee5713 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 22 Aug 2007 14:01:20 -0700
Subject: [PATCH] --- yaml --- r: 64229 b: refs/heads/master c:
 8b7f07155f8ee1536da2f9590f1aa9383afefb6b h: refs/heads/master i:   64227:
 81ed47d679c1569a2892b0f4c3a7334c9478a4e4 v: v3

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

diff --git a/[refs] b/[refs]
index 5b7559341ca0..fc7232dfb2b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 436bbd431d41e0fd3bfedb0312ab764b291ddf82
+refs/heads/master: 8b7f07155f8ee1536da2f9590f1aa9383afefb6b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 203a518b6f14..853aefbd184b 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -462,7 +462,9 @@ void free_irq(unsigned int irq, void *dev_id)
 		 * We do this after actually deregistering it, to make sure that
 		 * a 'real' IRQ doesn't run in parallel with our fake
 		 */
+		local_irq_save(flags);
 		handler(irq, dev_id);
+		local_irq_restore(flags);
 	}
 #endif
 }