---

yaml --- r: 360757 b: refs/heads/master c: facd8b8 h: refs/heads/master i: 360755: 4c6284d v: v3
git-mirror · Feb 21, 2013 · 1dc9785 · 1dc9785
1 parent a940d8c
commit 1dc9785
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74eed0163d0def3fce27228d9ccf3d36e207b286
+refs/heads/master: facd8b80c67a3cf64a467c4a2ac5fb31f2e6745b
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
@@ -322,18 +322,10 @@ void irq_enter(void)
 
 static inline void invoke_softirq(void)
 {
-	if (!force_irqthreads) {
-#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
+	if (!force_irqthreads)
 		__do_softirq();
-#else
-		do_softirq();
-#endif
-	} else {
-		__local_bh_disable((unsigned long)__builtin_return_address(0),
-				SOFTIRQ_OFFSET);
+	else
 		wakeup_softirqd();
-		__local_bh_enable(SOFTIRQ_OFFSET);
-	}
 }
 
 /*