Merge tag 'leds-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel...

[linux-2.6-microblaze.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 5a99696..4992853 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -423,7 +423,7 @@ static inline void invoke_softirq(void)
        if (ksoftirqd_running(local_softirq_pending()))
                return;
 
-       if (!force_irqthreads) {
+       if (!force_irqthreads || !__this_cpu_read(ksoftirqd)) {
 #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
                /*
                 * We can safely execute softirq on the current stack if