Message ID | 1535548752-4434-2-git-send-email-vincent.guittot@linaro.org |
---|---|
State | Accepted |
Commit | d90707ebebe03596e19de3abbf79b766e72a3465 |
Headers | show |
Series | sched/numa: remove unused code | expand |
> With : > commit 2d4056fafa19 ("sched/numa: Remove numa_has_capacity()") > > the local variables smt, cpus and capacity and their results are not used > anymore in numa_has_capacity() > > Remove this unused code > > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> > Cc: Rik van Riel <riel@surriel.com> > Cc: linux-kernel@vger.kernel.org (open list) > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> > --- > kernel/sched/fair.c | 21 +-------------------- > 1 file changed, 1 insertion(+), 20 deletions(-) Looks good to me. Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> -- Thanks and Regards Srikar Dronamraju
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 309c93f..c2b8bf4 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1463,8 +1463,7 @@ struct numa_stats { */ static void update_numa_stats(struct numa_stats *ns, int nid) { - int smt, cpu, cpus = 0; - unsigned long capacity; + int cpu; memset(ns, 0, sizeof(*ns)); for_each_cpu(cpu, cpumask_of_node(nid)) { @@ -1473,26 +1472,8 @@ static void update_numa_stats(struct numa_stats *ns, int nid) ns->nr_running += rq->nr_running; ns->load += weighted_cpuload(rq); ns->compute_capacity += capacity_of(cpu); - - cpus++; } - /* - * If we raced with hotplug and there are no CPUs left in our mask - * the @ns structure is NULL'ed and task_numa_compare() will - * not find this node attractive. - * - * We'll detect a huge imbalance and bail there. - */ - if (!cpus) - return; - - /* smt := ceil(cpus / capacity), assumes: 1 < smt_power < 2 */ - smt = DIV_ROUND_UP(SCHED_CAPACITY_SCALE * cpus, ns->compute_capacity); - capacity = cpus / smt; /* cores */ - - capacity = min_t(unsigned, capacity, - DIV_ROUND_CLOSEST(ns->compute_capacity, SCHED_CAPACITY_SCALE)); } struct task_numa_env {
With : commit 2d4056fafa19 ("sched/numa: Remove numa_has_capacity()") the local variables smt, cpus and capacity and their results are not used anymore in numa_has_capacity() Remove this unused code Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Rik van Riel <riel@surriel.com> Cc: linux-kernel@vger.kernel.org (open list) Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> --- kernel/sched/fair.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) -- 2.7.4