Commit 210dce81 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Aubrey Li
Browse files

topology: Remove unused cpu_cluster_mask() 

mainline inclusion
from mainline-v5.19-rc1
commit 991d8d81
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8LVOX


CVE: N/A

--------------------------------

Intel-SIG: commit 991d8d81 topology: Remove unused cpu_cluster_mask().
Cluster scheduler feature backport.

--------------------------------

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: 778c558f ("sched: Add cluster scheduler level in core and
related Kconfig for ARM64")

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarBarry Song <baohua@kernel.org>
Link: https://lore.kernel.org/r/20220513093433.425163-1-dietmar.eggemann@arm.com


Signed-off-by: default avatarAubrey Li <aubrey.li@linux.intel.com>
parent d476b6df

include/linux/topology.h

+0 −7
Original line number Diff line number Diff line
@@ -213,13 +213,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));