Merge "sched: core: Skip migrating tasks that aren't enqueued on dead_rq"

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 862eb8fd3860..84563da000cf 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5537,8 +5537,8 @@ static void migrate_tasks(struct rq *dead_rq, bool migrate_pinned_tasks)
 		 * interferred since we don't stop all CPUs. Ignore warning for
 		 * this case.
 		 */
-		if (WARN_ON((task_rq(next) != rq || !task_on_rq_queued(next)) &&
-			     migrate_pinned_tasks)) {
+		if (task_rq(next) != rq || !task_on_rq_queued(next)) {
+			WARN_ON(migrate_pinned_tasks);
 			raw_spin_unlock(&next->pi_lock);
 			continue;
 		}