diff options
| author |   Srikar Dronamraju <srikar@linux.vnet.ibm.com> | 2015-10-02 07:48:25 +0530 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:08:21 +0200 |
| commit | b52da86e0ad58f096710977fcda856fd84da9233 (patch) | |
| tree | cf673243313649eb45879010744976a27b2e759f /kernel/sched/fair.c | |
| parent | sched/core: Add preempt_count invariant check (diff) | |
| download | linux-dev-b52da86e0ad58f096710977fcda856fd84da9233.tar.xz linux-dev-b52da86e0ad58f096710977fcda856fd84da9233.zip | |
sched/numa: Fix task_tick_fair() from disabling numa_balancing
If static branch 'sched_numa_balancing' is enabled, it should kickstart
NUMA balancing through task_tick_numa(). However the following commit:
2a595721a1fa ("sched/numa: Convert sched_numa_balancing to a static_branch")
erroneously disables this.
Fix this anomaly by enabling task_tick_numa() when the static branch
'sched_numa_balancing' is enabled.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/fair.c')
| -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 4df37a48f499..3bdc3da7bc6a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7881,7 +7881,7 @@ 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 (static_branch_unlikely(&sched_numa_balancing)) task_tick_numa(rq, curr); } |