[PATCH 4/8] x86, topology: Swap semantic of core_siblings and cpu_node_siblings

Andreas Herrmann
2009-08-07T12:59:43Z

Brice Goglin suggested to use the following semantic for
CPU topology information

Level | Set of CPUs
--------------|---------------
phys_package | cpu_node_siblings
cpu_node | core_siblings
core | thread_siblings
thread | one CPU

Done that.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
arch/x86/include/asm/topology.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 9eddb69..d53ef91 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -188,10 +188,10 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
#ifdef ENABLE_TOPO_DEFINES
#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
-#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
+#define topology_core_cpumask(cpu) (per_cpu(cpu_node_map, cpu))
#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
#define topology_cpu_node_id(cpu) (cpu_data(cpu).cpu_node_id)
-#define topology_cpu_node_cpumask(cpu) (per_cpu(cpu_node_map, cpu))
+#define topology_cpu_node_cpumask(cpu) (per_cpu(cpu_core_map, cpu))

/* indicates that pointers to the topology cpumask_t maps are valid */
#define arch_provides_topology_pointers yes
--
1.6.3.3