lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86-64, NUMA: Make dummy node initialization path similar to non-dummy ones

Browse Source 
Dummy node initialization in initmem_init() didn't initialize apicid
to node mapping and set cpu to node mapping directly by caling
numa_set_node(), which is different from non-dummy init paths.

Update it such that they behave similarly.  Initialize apicid to node
mapping and call numa_init_array().  The actual cpu to node mapping is
handled by init_cpu_to_node() later.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Tejun Heo
2011-02-16 12:13:06 +01:00
parent 275a88d3cf
commit 7d36b7bc90
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/mm/numa_64.c
View File

@@ -624,11 +624,12 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
memnodemap[0] = 0; memnodemap[0] = 0;
node_set_online(0); node_set_online(0);
node_set(0, node_possible_map); node_set(0, node_possible_map);
for (i = 0; i < nr_cpu_ids; i++) for (i = 0; i < MAX_LOCAL_APIC; i++)
numa_set_node(i, 0); set_apicid_to_node(i, NUMA_NO_NODE);
memblock_x86_register_active_regions(0, start_pfn, last_pfn); memblock_x86_register_active_regions(0, start_pfn, last_pfn);
init_memory_mapping_high(); init_memory_mapping_high();
setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT);
numa_init_array();
} }
unsigned long __init numa_free_all_bootmem(void) unsigned long __init numa_free_all_bootmem(void)