Merge branch 'sched/urgent' into sched/core, to pick up fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2020-05-28 10:52:37 +02:00
commit 498bdcdb94

View File

@ -2908,7 +2908,7 @@ static void task_tick_numa(struct rq *rq, struct task_struct *curr)
/*
* We don't care about NUMA placement if we don't have memory.
*/
if (!curr->mm || (curr->flags & PF_EXITING) || work->next != work)
if ((curr->flags & (PF_EXITING | PF_KTHREAD)) || work->next != work)
return;
/*