The following commit has been merged into the sched/core branch of tip:
Commit-ID: 991d8d8142cad94f9c5c05db25e67fa83d6f772a
Gitweb: https://git.kernel.org/tip/991d8d8142cad94f9c5c05db25e67fa83d6f772a
Author: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
AuthorDate: Fri, 13 May 2022 11:34:33 +02:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Thu, 19 May 2022 23:46:13 +02:00
topology: Remove unused cpu_cluster_mask()
default_topology[] uses cpu_clustergroup_mask() for the CLS level
(guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
(arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).
Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
related Kconfig for ARM64")
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Acked-by: Barry Song <baohua@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220513093433.425163-1-dietmar.eggemann@xxxxxxx
---
include/linux/topology.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/include/linux/topology.h b/include/linux/topology.h
index f19bc36..4564faa 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
}
#endif
-#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
-static inline const struct cpumask *cpu_cluster_mask(int cpu)
-{
- return topology_cluster_cpumask(cpu);
-}
-#endif
-
static inline const struct cpumask *cpu_cpu_mask(int cpu)
{
return cpumask_of_node(cpu_to_node(cpu));
|