softirq: Reduce invoke_softirq() code duplication
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 5 Mar 2012 23:07:25 +0000 (15:07 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 6 Mar 2012 12:33:27 +0000 (13:33 +0100)
The two invoke_softirq() variants are identical except for a single
line. So move the #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED inside one of
the functions and get rid of the other one.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/softirq.c

index 4eb3a0fa351e788297e7d14f0f56cec66d61c1ae..c82d95a022ef76b76850bb0d9cefb9caffdb450d 100644 (file)
@@ -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: