From e495fb44599d5f607b7868569624ec91a21bb1c2 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 5 Mar 2012 15:07:25 -0800
Subject: [PATCH] --- yaml --- r: 288592 b: refs/heads/master c:
 b2a00178614e2cdd981a708d22a05c1ce4eadfd7 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/softirq.c | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 2a3e28dd72f4..75ed3d870b75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a09b659cd68c10ec6a30cb91ebd2c327fcd5bfe5
+refs/heads/master: b2a00178614e2cdd981a708d22a05c1ce4eadfd7
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 4eb3a0fa351e..c82d95a022ef 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -310,31 +310,21 @@ void irq_enter(void)
 	__irq_enter();
 }
 
-#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
 static inline void invoke_softirq(void)
 {
-	if (!force_irqthreads)
+	if (!force_irqthreads) {
+#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
 		__do_softirq();
-	else {
-		__local_bh_disable((unsigned long)__builtin_return_address(0),
-				SOFTIRQ_OFFSET);
-		wakeup_softirqd();
-		__local_bh_enable(SOFTIRQ_OFFSET);
-	}
-}
 #else
-static inline void invoke_softirq(void)
-{
-	if (!force_irqthreads)
 		do_softirq();
-	else {
+#endif
+	} else {
 		__local_bh_disable((unsigned long)__builtin_return_address(0),
 				SOFTIRQ_OFFSET);
 		wakeup_softirqd();
 		__local_bh_enable(SOFTIRQ_OFFSET);
 	}
 }
-#endif
 
 /*
  * Exit an interrupt context. Process softirqs if needed and possible: