Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d36b7bc authored by Tejun Heo's avatar Tejun Heo
Browse files

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



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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarYinghai 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>
parent 275a88d3

arch/x86/mm/numa_64.c

+3 −2
Original line number Diff line number Diff line
@@ -624,11 +624,12 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn, 
	memnodemap[0] = 0;

	node_set_online(0);

	node_set(0, node_possible_map);

	for (i = 0; i < nr_cpu_ids; i++)

		numa_set_node(i, 0);

	for (i = 0; i < MAX_LOCAL_APIC; i++)

		set_apicid_to_node(i, NUMA_NO_NODE);

	memblock_x86_register_active_regions(0, start_pfn, last_pfn);

	init_memory_mapping_high();

	setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT);

	numa_init_array();

}



unsigned long __init numa_free_all_bootmem(void)