Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a00178 authored by Heiko Carstens's avatar Heiko Carstens Committed by Thomas Gleixner
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a09b659c

kernel/softirq.c

+4 −14
Original line number Diff line number Diff line
@@ -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: