summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorbsegall@google.com <bsegall@google.com>2015-06-16 12:18:21 -0700
committerIngo Molnar <mingo@kernel.org>2015-07-07 08:46:09 +0200
commit6dfec8d9493f48a42896386b41ec1a4644331b0b (patch)
tree3028b4e29b88bc0380917745eaaa36935e0e495c /kernel/sched
parentd49db342f0e276b354383b3281c5668b6b80f5c2 (diff)
downloadlinux-6dfec8d9493f48a42896386b41ec1a4644331b0b.tar.bz2
sched/numa: Check sched_feat(NUMA) in migrate_improves_locality()
migrate_improves_locality checked sched_feat(NUMA_FAVOUR_HIGHER) but not sched_feat(NUMA), so disabling just the NUMA feature would leave it working off of old data. Signed-off-by: Ben Segall <bsegall@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/xm26si9rtqbm.fsf@sword-of-the-dawn.mtv.corp.google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/fair.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d113c3ba8bc4..98b2b961df33 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5680,8 +5680,8 @@ static bool migrate_improves_locality(struct task_struct *p, struct lb_env *env)
unsigned long src_faults, dst_faults;
int src_nid, dst_nid;
- if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults ||
- !(env->sd->flags & SD_NUMA)) {
+ if (!sched_feat(NUMA) || !sched_feat(NUMA_FAVOUR_HIGHER) ||
+ !p->numa_faults || !(env->sd->flags & SD_NUMA)) {
return false;
}