diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:00 -0400 |
commit | 04d1dd20f64f2b41baf5c01f57c574ca942ab4eb (patch) | |
tree | a2aa8a1b54b3db29f009cfdcfa88a231693701d0 /include/asm-x86 | |
parent | ccf82085ee32c9b171183d8042e8a6e2776ec628 (diff) |
x86: make node to apic mapping declarations unconditional
Instead of declaring them inside of X86_64 ifdef, do it
unconditionally
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/topology.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 8af05a93f097..dada89e5b152 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h | |||
@@ -32,15 +32,15 @@ | |||
32 | /* Mappings between logical cpu number and node number */ | 32 | /* Mappings between logical cpu number and node number */ |
33 | #ifdef CONFIG_X86_32 | 33 | #ifdef CONFIG_X86_32 |
34 | extern int cpu_to_node_map[]; | 34 | extern int cpu_to_node_map[]; |
35 | |||
36 | #else | 35 | #else |
37 | DECLARE_PER_CPU(int, x86_cpu_to_node_map); | ||
38 | extern int x86_cpu_to_node_map_init[]; | ||
39 | extern void *x86_cpu_to_node_map_early_ptr; | ||
40 | /* Returns the number of the current Node. */ | 36 | /* Returns the number of the current Node. */ |
41 | #define numa_node_id() (early_cpu_to_node(raw_smp_processor_id())) | 37 | #define numa_node_id() (early_cpu_to_node(raw_smp_processor_id())) |
42 | #endif | 38 | #endif |
43 | 39 | ||
40 | DECLARE_PER_CPU(int, x86_cpu_to_node_map); | ||
41 | extern int x86_cpu_to_node_map_init[]; | ||
42 | extern void *x86_cpu_to_node_map_early_ptr; | ||
43 | |||
44 | extern cpumask_t node_to_cpumask_map[]; | 44 | extern cpumask_t node_to_cpumask_map[]; |
45 | 45 | ||
46 | #define NUMA_NO_NODE (-1) | 46 | #define NUMA_NO_NODE (-1) |