diff options
| author | travis@sgi.com <travis@sgi.com> | 2008-01-30 13:33:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:11 +0100 |
| commit | df3825c56dd70a4d7796041388f3cfe51c1db832 (patch) | |
| tree | 6110ef6ce26704679b9d13399e2aa368f3430126 /arch/x86/mm | |
| parent | 3b41908902df1dba141cd7de1a727bb03718a654 (diff) | |
x86: change NR_CPUS arrays in numa_64
Change the following static arrays sized by NR_CPUS to
per_cpu data variables:
char cpu_to_node_map[NR_CPUS];
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index bc6dd5051d6..382377d6421 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -31,10 +31,14 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES]; struct memnode memnode; -u16 cpu_to_node_map[NR_CPUS] __read_mostly = { +u16 x86_cpu_to_node_map_init[NR_CPUS] __initdata = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; -EXPORT_SYMBOL(cpu_to_node_map); +void *x86_cpu_to_node_map_early_ptr; +EXPORT_SYMBOL(x86_cpu_to_node_map_init); +EXPORT_SYMBOL(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); u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE @@ -544,7 +548,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) node_set(0, node_possible_map); for (i = 0; i < NR_CPUS; i++) numa_set_node(i, 0); - /* we can't use cpumask_of_cpu() yet */ + /* cpumask_of_cpu() may not be available during early startup */ memset(&node_to_cpumask_map[0], 0, sizeof(node_to_cpumask_map[0])); cpu_set(0, node_to_cpumask_map[0]); e820_register_active_regions(0, start_pfn, end_pfn); @@ -558,8 +562,16 @@ __cpuinit void numa_add_cpu(int cpu) void __cpuinit numa_set_node(int cpu, int node) { + u16 *cpu_to_node_map = (u16 *)x86_cpu_to_node_map_early_ptr; + cpu_pda(cpu)->nodenumber = node; - cpu_to_node_map[cpu] = node; + + if(cpu_to_node_map) + cpu_to_node_map[cpu] = node; + else if(per_cpu_offset(cpu)) + per_cpu(x86_cpu_to_node_map, cpu) = node; + else + Dprintk(KERN_INFO "Setting node for non-present cpu %d\n", cpu); } unsigned long __init numa_free_all_bootmem(void) |