diff options
author | 2020-05-28 10:52:37 +0200 | |
---|---|---|
committer | 2020-05-28 10:52:37 +0200 | |
commit | 498bdcdb949e879d4a45f415468aef802a3dff4a (patch) | |
tree | ebed096e03927a8b4750e2bf1681c37322d72faa | |
parent | sched/core: Offload wakee task activation if it the wakee is descheduling (diff) | |
parent | sched/fair: Don't NUMA balance for kthreads (diff) | |
download | wireguard-linux-498bdcdb949e879d4a45f415468aef802a3dff4a.tar.xz wireguard-linux-498bdcdb949e879d4a45f415468aef802a3dff4a.zip |
Merge branch 'sched/urgent' into sched/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 01f94cf52783..dda9b194d225 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -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; /* |