Messages in this thread Patch in this message | | | From | Mel Gorman <> | Subject | [PATCH 2/4] sched/numa: Remove unused calculations in update_numa_stats | Date | Fri, 7 Sep 2018 11:11:37 +0100 |
| |
Commit 2d4056fafa19 ("sched/numa: Remove numa_has_capacity()") removed the the has_free_capacity field but did not remove calculations related to it in update_numa_stats. This patch removes the unused code.
Signed-off-by: Mel Gorman <mgorman@techsingularity.net> --- kernel/sched/fair.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2472aeaff92e..5b2f1684e96e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1461,8 +1461,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)) { @@ -1470,26 +1469,7 @@ static void update_numa_stats(struct numa_stats *ns, int nid) 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 { -- 2.16.4
| |