aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <[email protected]>2022-09-03 08:05:08 +0200
committerGreg Kroah-Hartman <[email protected]>2022-09-03 08:08:06 +0200
commitc749b275056d4d1023af125b320c91a24d6856b8 (patch)
treeac7efbdb2aa65d3e69044fb646951ed63829f974
parent6b66ca0bac1b9cee7608d7c4dc59b699458b4cb8 (diff)
Revert "arch_topology: Make cluster topology span at least SMT CPUs"
This reverts commit 6b66ca0bac1b9cee7608d7c4dc59b699458b4cb8 as it breaks the build on some arches as reported by the kernel test robot. Link: https://lore.kernel.org/r/[email protected] Reported-by: kernel test robot <[email protected]> Fixes: 6b66ca0bac1b ("arch_topology: Make cluster topology span at least SMT CPUs") Cc: Sudeep Holla <[email protected]> Cc: Vincent Guittot <[email protected]> Cc: Ionela Voinescu <[email protected]> Cc: Yicong Yang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/base/arch_topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 59880b5d9fe2..eaa1b8d2d39d 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -724,7 +724,7 @@ const struct cpumask *cpu_clustergroup_mask(int cpu)
*/
if (cpumask_subset(cpu_coregroup_mask(cpu),
&cpu_topology[cpu].cluster_sibling))
- return cpu_smt_mask(cpu);
+ return get_cpu_mask(cpu);
return &cpu_topology[cpu].cluster_sibling;
}