The following commit has been merged into the sched/core branch of tip: Commit-ID: f43df9225fcad9b07a4ef4d0fe4c3ad2fb4ce82d Gitweb: https://git.kernel.org/tip/f43df9225fcad9b07a4ef4d0fe4c3ad2fb4ce82d Author: Yicong Yang <yangyicong@xxxxxxxxxxxxx> AuthorDate: Wed, 15 Sep 2021 14:31:58 +08:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Thu, 07 Oct 2021 13:51:17 +02:00 sched/topology: Remove unused numa_distance in cpu_attach_domain() numa_distance in cpu_attach_domain() is introduced in commit b5b217346de8 ("sched/topology: Warn when NUMA diameter > 2") to warn user when NUMA diameter > 2 as we'll misrepresent the scheduler topology structures at that time. This is fixed by Barry in commit 585b6d2723dc ("sched/topology: fix the issue groups don't span domain->span for NUMA diameter > 2") and numa_distance is unused now. So remove it. Signed-off-by: Yicong Yang <yangyicong@xxxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Barry Song <baohua@xxxxxxxxxx> Reviewed-by: Valentin Schneider <valentin.schneider@xxxxxxx> Link: https://lore.kernel.org/r/20210915063158.80639-1-yangyicong@xxxxxxxxxxxxx --- kernel/sched/topology.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index c56faae..5af3edd 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -688,7 +688,6 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) { struct rq *rq = cpu_rq(cpu); struct sched_domain *tmp; - int numa_distance = 0; /* Remove the sched domains which do not contribute to scheduling. */ for (tmp = sd; tmp; ) { @@ -732,9 +731,6 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) } } - for (tmp = sd; tmp; tmp = tmp->parent) - numa_distance += !!(tmp->flags & SD_NUMA); - sched_domain_debug(sd, cpu); rq_attach_root(rq, rd);
![]() |