diff options
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f77f9c527449..9565645e3202 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
| @@ -851,7 +851,7 @@ void task_numa_fault(int node, int pages, bool migrated) | |||
| 851 | { | 851 | { |
| 852 | struct task_struct *p = current; | 852 | struct task_struct *p = current; |
| 853 | 853 | ||
| 854 | if (!sched_feat_numa(NUMA)) | 854 | if (!numabalancing_enabled) |
| 855 | return; | 855 | return; |
| 856 | 856 | ||
| 857 | /* FIXME: Allocate task-specific structure for placement policy here */ | 857 | /* FIXME: Allocate task-specific structure for placement policy here */ |
| @@ -5506,7 +5506,7 @@ void nohz_balance_enter_idle(int cpu) | |||
| 5506 | set_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)); | 5506 | set_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)); |
| 5507 | } | 5507 | } |
| 5508 | 5508 | ||
| 5509 | static int __cpuinit sched_ilb_notifier(struct notifier_block *nfb, | 5509 | static int sched_ilb_notifier(struct notifier_block *nfb, |
| 5510 | unsigned long action, void *hcpu) | 5510 | unsigned long action, void *hcpu) |
| 5511 | { | 5511 | { |
| 5512 | switch (action & ~CPU_TASKS_FROZEN) { | 5512 | switch (action & ~CPU_TASKS_FROZEN) { |
| @@ -5786,7 +5786,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) | |||
| 5786 | entity_tick(cfs_rq, se, queued); | 5786 | entity_tick(cfs_rq, se, queued); |
| 5787 | } | 5787 | } |
| 5788 | 5788 | ||
| 5789 | if (sched_feat_numa(NUMA)) | 5789 | if (numabalancing_enabled) |
| 5790 | task_tick_numa(rq, curr); | 5790 | task_tick_numa(rq, curr); |
| 5791 | 5791 | ||
| 5792 | update_rq_runnable_avg(rq, 1); | 5792 | update_rq_runnable_avg(rq, 1); |
