From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 3 Sep 2022 06:05:08 +0000 (+0200)
Subject: Revert "arch_topology: Make cluster topology span at least SMT CPUs"
X-Git-Tag: v6.0-rc5~10^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c749b275056d4d1023af125b320c91a24d6856b8;p=tomoyo%2Ftomoyo-test1.git

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/202209030824.SouwDV5M-lkp@intel.com
Reported-by: kernel test robot <lkp@intel.com>
Fixes: 6b66ca0bac1b ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

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