aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/topology.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86/topology.h')
-rw-r--r--include/asm-x86/topology.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index 81a29eb08ac4..b167ca90f96f 100644
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -88,6 +88,17 @@ static inline int cpu_to_node(int cpu)
88#endif 88#endif
89 return per_cpu(x86_cpu_to_node_map, cpu); 89 return per_cpu(x86_cpu_to_node_map, cpu);
90} 90}
91
92#ifdef CONFIG_NUMA
93
94/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
95#define node_to_cpumask_ptr(v, node) \
96 cpumask_t *v = &(node_to_cpumask_map[node])
97
98#define node_to_cpumask_ptr_next(v, node) \
99 v = &(node_to_cpumask_map[node])
100#endif
101
91#endif /* CONFIG_X86_64 */ 102#endif /* CONFIG_X86_64 */
92 103
93/* 104/*
@@ -174,10 +185,10 @@ extern int __node_distance(int, int);
174 185
175#else /* CONFIG_NUMA */ 186#else /* CONFIG_NUMA */
176 187
177#include <asm-generic/topology.h>
178
179#endif 188#endif
180 189
190#include <asm-generic/topology.h>
191
181extern cpumask_t cpu_coregroup_map(int cpu); 192extern cpumask_t cpu_coregroup_map(int cpu);
182 193
183#ifdef ENABLE_TOPO_DEFINES 194#ifdef ENABLE_TOPO_DEFINES