From: Andrew Morton Date: Wed, 30 Jan 2008 12:33:14 +0000 (+0100) Subject: arch/x86/mm/numa_64.c: section fix X-Git-Tag: v2.6.25-rc1~1143^2~276 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=118c890961a2ca456947d72ebe0ce43de07907f0;p=linux-2.6-omap-h63xx.git arch/x86/mm/numa_64.c: section fix WARNING: vmlinux.o(__ksymtab+0x670): Section mismatch: reference to .init.data:x86_cpu_to_node_map_init (between '__ksymtab_x86_cpu_to_node_map_init' and '__ksymtab_node_data') Cc: Matthew Dobson Cc: Mike Travis Cc: Christoph Lameter 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 dca58fb39b0..7b03d2090c2 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -31,7 +31,7 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES]; struct memnode memnode; -u16 x86_cpu_to_node_map_init[NR_CPUS] __initdata = { +u16 x86_cpu_to_node_map_init[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; void *x86_cpu_to_node_map_early_ptr; diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index a89b46eb252..2da1464ecbe 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -31,7 +31,7 @@ /* Mappings between logical cpu number and node number */ DECLARE_PER_CPU(u16, x86_cpu_to_node_map); -extern u16 __initdata x86_cpu_to_node_map_init[]; +extern u16 x86_cpu_to_node_map_init[]; extern void *x86_cpu_to_node_map_early_ptr; extern cpumask_t node_to_cpumask_map[];