diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 415fa17f275a..aae681a9566c 100755 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2480,7 +2480,8 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags) struct numa_group *ng; int priv; - if (!static_branch_likely(&sched_numa_balancing)) + if (!IS_ENABLED(CONFIG_NUMA_BALANCING) || + !static_branch_likely(&sched_numa_balancing)) return; /* for example, ksmd faulting in a user's mm */ @@ -12226,7 +12227,8 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) entity_tick(cfs_rq, se, queued); } - if (static_branch_unlikely(&sched_numa_balancing)) + if (IS_ENABLED(CONFIG_NUMA_BALANCING) && + static_branch_unlikely(&sched_numa_balancing)) task_tick_numa(rq, curr); update_misfit_status(curr, rq);