From: Glauber de Oliveira Costa Date: Wed, 19 Mar 2008 17:25:21 +0000 (-0300) Subject: x86: make node to apic mapping declarations unconditional X-Git-Tag: v2.6.26-rc1~1154^2~376 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=04d1dd20f64f2b41baf5c01f57c574ca942ab4eb;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Ingo Molnar --- diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 8af05a93f09..dada89e5b15 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -32,15 +32,15 @@ /* Mappings between logical cpu number and node number */ #ifdef CONFIG_X86_32 extern int cpu_to_node_map[]; - #else -DECLARE_PER_CPU(int, x86_cpu_to_node_map); -extern int x86_cpu_to_node_map_init[]; -extern void *x86_cpu_to_node_map_early_ptr; /* Returns the number of the current Node. */ #define numa_node_id() (early_cpu_to_node(raw_smp_processor_id())) #endif +DECLARE_PER_CPU(int, x86_cpu_to_node_map); +extern int x86_cpu_to_node_map_init[]; +extern void *x86_cpu_to_node_map_early_ptr; + extern cpumask_t node_to_cpumask_map[]; #define NUMA_NO_NODE (-1)