From: Srikar Dronamraju Date: Thu, 15 Apr 2021 12:09:33 +0000 (+0530) Subject: Revert "powerpc/topology: Update topology_core_cpumask" X-Git-Tag: v5.15~1232^2~63 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=131c82b6a1d261705a6f98368e501d43d994018d;p=platform%2Fkernel%2Flinux-starfive.git Revert "powerpc/topology: Update topology_core_cpumask" Now that cpu_core_mask has been reintroduced, lets revert commit 4bce545903fa ("powerpc/topology: Update topology_core_cpumask") Post this commit, lscpu should reflect topologies as requested by a user when a QEMU instance is launched with NUMA spanning multiple sockets. Reported-by: Daniel Henrique Barboza Signed-off-by: Srikar Dronamraju Tested-by: Daniel Henrique Barboza Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210415120934.232271-3-srikar@linux.vnet.ibm.com --- diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 3beeb03..e4db64c 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h @@ -126,7 +126,7 @@ static inline int cpu_to_coregroup_id(int cpu) #define topology_physical_package_id(cpu) (cpu_to_chip_id(cpu)) #define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu)) -#define topology_core_cpumask(cpu) (cpu_cpu_mask(cpu)) +#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu)) #define topology_core_id(cpu) (cpu_to_core_id(cpu)) #endif