diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:38 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:38 -0500 |
commit | fe21a445b98c9d52f02f3412d7a2fd39784f3b22 (patch) | |
tree | 501d6bfe7997d2329cd0687b9295bebc6a866122 /include | |
parent | 7462894a7cb03b54b9139f31fab5928366752a78 (diff) |
x86: adjust numa 32 namespace
Use the 64bit numa variable names for numa32 as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/topology_32.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/topology_32.h b/include/asm-x86/topology_32.h index fdca80a851e2..e28dbdcc5670 100644 --- a/include/asm-x86/topology_32.h +++ b/include/asm-x86/topology_32.h | |||
@@ -39,13 +39,13 @@ | |||
39 | #include <linux/cpumask.h> | 39 | #include <linux/cpumask.h> |
40 | 40 | ||
41 | /* Mappings between logical cpu number and node number */ | 41 | /* Mappings between logical cpu number and node number */ |
42 | extern cpumask_t node_2_cpu_mask[]; | 42 | extern cpumask_t node_to_cpumask_map[]; |
43 | extern int cpu_2_node[]; | 43 | extern int cpu_to_node_map[]; |
44 | 44 | ||
45 | /* Returns the number of the node containing CPU 'cpu' */ | 45 | /* Returns the number of the node containing CPU 'cpu' */ |
46 | static inline int cpu_to_node(int cpu) | 46 | static inline int cpu_to_node(int cpu) |
47 | { | 47 | { |
48 | return cpu_2_node[cpu]; | 48 | return cpu_to_node_map[cpu]; |
49 | } | 49 | } |
50 | 50 | ||
51 | /* Returns the number of the node containing Node 'node'. This architecture is flat, | 51 | /* Returns the number of the node containing Node 'node'. This architecture is flat, |
@@ -55,7 +55,7 @@ static inline int cpu_to_node(int cpu) | |||
55 | /* Returns a bitmask of CPUs on Node 'node'. */ | 55 | /* Returns a bitmask of CPUs on Node 'node'. */ |
56 | static inline cpumask_t node_to_cpumask(int node) | 56 | static inline cpumask_t node_to_cpumask(int node) |
57 | { | 57 | { |
58 | return node_2_cpu_mask[node]; | 58 | return node_to_cpumask_map[node]; |
59 | } | 59 | } |
60 | 60 | ||
61 | /* Returns the number of the first CPU on Node 'node'. */ | 61 | /* Returns the number of the first CPU on Node 'node'. */ |