From: chris hyser Date: Thu, 7 Apr 2016 19:12:05 +0000 (-0700) Subject: sparc64: Fix CPU package information in /sys X-Git-Tag: v4.1.12-92~163^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0519e5a3f2365472a222b8b521f52af58d56bd1f;p=users%2Fjedix%2Flinux-maple.git sparc64: Fix CPU package information in /sys CPU package information in /sys/bus/cpu/devices/cpu*/topology/physical_package_id is inconisistent with the use by tools such as irqbalance. This patch uses the socket ID to be consistent and useful. Orabug: 22748950 Signed-off-by: Chris Hyser --- diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 62969cc5a474d..637ced3c1c2e1 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@ -41,7 +41,7 @@ int __node_distance(int, int); #endif /* !(CONFIG_NUMA) */ #ifdef CONFIG_SMP -#define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) +#define topology_physical_package_id(cpu) (cpu_data(cpu).sock_id) #define topology_core_id(cpu) (cpu_data(cpu).core_id) #define topology_core_cpumask(cpu) (&cpu_core_sib_map[cpu]) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu))