aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched/fair.c
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2013-07-31 16:53:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-31 17:41:02 -0400
commit10e84b97ed799be404836dc7f71ab47d4571265a (patch)
treef3976fd809015195eb5965204a8344ab255a273b /kernel/sched/fair.c
parentf93f3c4ee48727713c3349b659adf8048fd4524b (diff)
mm: sched: numa: fix NUMA balancing when !SCHED_DEBUG
Commit 3105b86a9fee ("mm: sched: numa: Control enabling and disabling of NUMA balancing if !SCHED_DEBUG") defined numabalancing_enabled to control the enabling and disabling of automatic NUMA balancing, but it is never used. I believe the intention was to use this in place of sched_feat_numa(NUMA). Currently, if SCHED_DEBUG is not defined, sched_feat_numa(NUMA) will never be changed from the initial "false". Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Acked-by: Mel Gorman <mgorman@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sched/fair.c')
-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 bb456f44b7b1..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 */
@@ -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);