From: Mike Travis Date: Wed, 30 Jan 2008 12:33:25 +0000 (+0100) Subject: x86: fix early cpu_to_node panic from nr_free_zone_pages X-Git-Tag: v2.6.25-rc1~1143^2~207 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=625d6cffcac1c96faa18d629f1271d63af0e05f2;p=linux-2.6-omap-h63xx.git x86: fix early cpu_to_node panic from nr_free_zone_pages call early_cpu_to_node() since per_cpu(cpu_to_node_map) might not be setup yet. I also had to export x86_cpu_to_node_map_early_ptr because of some calls from the network code to numa_node_id(): net/ipv4/netfilter/arp_tables.c: net/ipv4/netfilter/ip_tables.c: net/ipv4/netfilter/ip_tables.c: Signed-off-by: Mike Travis Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 70b463abf6f..441af4edea5 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -37,9 +37,7 @@ u16 x86_cpu_to_node_map_init[NR_CPUS] = { void *x86_cpu_to_node_map_early_ptr; DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE; EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map); -#ifdef CONFIG_DEBUG_PER_CPU_MAPS EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr); -#endif u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 9a8228a177c..7b0cce2f370 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -37,6 +37,8 @@ extern u8 cpu_to_node_map[]; DECLARE_PER_CPU(u16, x86_cpu_to_node_map); extern u16 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 extern cpumask_t node_to_cpumask_map[];