Revert "arch_topology: Make cluster topology span at least SMT CPUs"

This reverts commit 6b66ca0 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: 6b66ca0 ("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]>

Author: gregkh

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;
 }