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

This commit is contained in:
Linux Build Service Account 2016-11-14 21:54:02 -08:00 committed by Gerrit - the friendly Code Review server
commit 30f6933a15

View file

@ -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;
}