aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-10-01 09:38:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-10-01 09:38:05 -0700
commitc5ecffe6d3e438dd7094ac37461e77960269aff0 (patch)
tree34cb8af98890c5f6b1a5834cfd80e3d7e0bafa6c
parent3a38c57a87aeb5c6d71a1b6dd572569112dbce38 (diff)
parentfc09027786c900368de98d03d40af058bcb01ad9 (diff)
downloadvfs-c5ecffe6d3e438dd7094ac37461e77960269aff0.tar.gz
Merge tag 'sched-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: "Fix a RT tasks related lockup/live-lock during CPU offlining" * tag 'sched-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/rt: Fix live lock between select_fallback_rq() and RT push
-rw-r--r--kernel/sched/cpupri.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c
index a286e726eb4b8..42c40cfdf8363 100644
--- a/kernel/sched/cpupri.c
+++ b/kernel/sched/cpupri.c
@@ -101,6 +101,7 @@ static inline int __cpupri_find(struct cpupri *cp, struct task_struct *p,
if (lowest_mask) {
cpumask_and(lowest_mask, &p->cpus_mask, vec->mask);
+ cpumask_and(lowest_mask, lowest_mask, cpu_active_mask);
/*
* We have to ensure that we have at least one bit