From 26f7725279af91b70b52531b7b69a7b9ecd182d2 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@o2.pl>
Date: Thu, 30 Aug 2007 23:56:34 -0700
Subject: [PATCH] --- yaml --- r: 64634 b: refs/heads/master c:
 59845b1ffd9121e5ef474ea5f27405fd7a83c85b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b062999c37e..8327b94e0a14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aeb3db17fc33443d21b11d7121c5627d55717c6
+refs/heads/master: 59845b1ffd9121e5ef474ea5f27405fd7a83c85b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 853aefbd184b..7230d914eaa2 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -547,14 +547,11 @@ int request_irq(unsigned int irq, irq_handler_t handler,
 		 * We do this before actually registering it, to make sure that
 		 * a 'real' IRQ doesn't run in parallel with our fake
 		 */
-		if (irqflags & IRQF_DISABLED) {
-			unsigned long flags;
+		unsigned long flags;
 
-			local_irq_save(flags);
-			handler(irq, dev_id);
-			local_irq_restore(flags);
-		} else
-			handler(irq, dev_id);
+		local_irq_save(flags);
+		handler(irq, dev_id);
+		local_irq_restore(flags);
 	}
 #endif