---

yaml --- r: 64634 b: refs/heads/master c: 59845b1 h: refs/heads/master v: v3
git-mirror · Aug 31, 2007 · 26f7725 · 26f7725
1 parent c4e1af9
commit 26f7725
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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