Commit c749b275 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit 6b66ca0b as it
breaks the build on some arches as reported by the kernel test robot.

Link: https://lore.kernel.org/r/202209030824.SouwDV5M-lkp@intel.com


Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: 6b66ca0b ("arch_topology: Make cluster topology span at least SMT CPUs")
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Ionela Voinescu <ionela.voinescu@arm.com>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b66ca0b

drivers/base/arch_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}