[PATCH 26/79] [PATCH] make node to apic mapping declarations unconditional

From: Glauber de Oliveira Costa
Date: Wed Mar 19 2008 - 15:58:52 EST


From: Glauber Costa <gcosta@xxxxxxxxxx>

Instead of declaring them inside of X86_64 ifdef, do it
unconditionally

Signed-off-by: Glauber Costa <gcosta@xxxxxxxxxx>
---
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 fd38c3a..5bc825b 100644
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -33,15 +33,15 @@ struct pci_bus;
/* 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)
--
1.5.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/