softirq: reduce invoke_softirq() code duplication
PATCH 1/1 softirq: reduce invoke_softirq() code duplication
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 <[email protected]>
--- kernel/softirq.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-)
kernel/softirq.c +4 -14
@@ -310,31 +310,21 @@ void irq_enter(void)__irq_enter (); } -#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLEDstatic 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:
Signature · 1 line
1.7.9