Skip to content

Commit 93e4f73

Browse files
committed
Merge branch 'sched/smp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-5.12/block-ipi
* 'sched/smp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smp: Process pending softirqs in flush_smp_call_function_from_idle()
2 parents 92bf226 + 66040b2 commit 93e4f73

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/smp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/export.h>
1515
#include <linux/percpu.h>
1616
#include <linux/init.h>
17+
#include <linux/interrupt.h>
1718
#include <linux/gfp.h>
1819
#include <linux/smp.h>
1920
#include <linux/cpu.h>
@@ -449,6 +450,9 @@ void flush_smp_call_function_from_idle(void)
449450

450451
local_irq_save(flags);
451452
flush_smp_call_function_queue(true);
453+
if (local_softirq_pending())
454+
do_softirq();
455+
452456
local_irq_restore(flags);
453457
}
454458

0 commit comments

Comments
 (0)