Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit facd8b8

Browse files
committed
irq: Sanitize invoke_softirq
With the irq protection in irq_exit, we can remove the #ifdeffery and the bh_disable/enable dance in invoke_softirq() Signed-off-by: Thomas Gleixner <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1302202155320.22263@ionos
1 parent 74eed01 commit facd8b8

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Diff for: kernel/softirq.c

+2-10
Original file line numberDiff line numberDiff line change
@@ -322,18 +322,10 @@ void irq_enter(void)
322322

323323
static inline void invoke_softirq(void)
324324
{
325-
if (!force_irqthreads) {
326-
#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
325+
if (!force_irqthreads)
327326
__do_softirq();
328-
#else
329-
do_softirq();
330-
#endif
331-
} else {
332-
__local_bh_disable((unsigned long)__builtin_return_address(0),
333-
SOFTIRQ_OFFSET);
327+
else
334328
wakeup_softirqd();
335-
__local_bh_enable(SOFTIRQ_OFFSET);
336-
}
337329
}
338330

339331
/*

0 commit comments

Comments
 (0)