For the separation, we need to set memblock nid later, as it could change memblock array, and possible doube memblock.memory array that will need to allocate buffer.
Only set memblock nid one time for successful path. Also rename numa_register_memblks to numa_check_memblks() after move out code for setting memblock nid. Signed-off-by: Yinghai Lu <ying...@kernel.org> --- arch/x86/mm/numa.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index fcaeba9..e2ddcbd 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -537,10 +537,9 @@ static unsigned long __init node_map_pfn_alignment(struct numa_meminfo *mi) } #endif -static int __init numa_register_memblks(struct numa_meminfo *mi) +static int __init numa_check_memblks(struct numa_meminfo *mi) { unsigned long pfn_align; - int i; /* Account for nodes with cpus and no memory */ node_possible_map = numa_nodes_parsed; @@ -563,11 +562,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) return -EINVAL; } - for (i = 0; i < mi->nr_blks; i++) { - struct numa_memblk *mb = &mi->blk[i]; - memblock_set_node(mb->start, mb->end - mb->start, mb->nid); - } - return 0; } @@ -604,7 +598,6 @@ static int __init numa_init(int (*init_func)(void)) nodes_clear(numa_nodes_parsed); nodes_clear(node_possible_map); memset(&numa_meminfo, 0, sizeof(numa_meminfo)); - WARN_ON(memblock_set_node(0, ULLONG_MAX, MAX_NUMNODES)); numa_reset_distance(); ret = init_func(); @@ -616,7 +609,7 @@ static int __init numa_init(int (*init_func)(void)) numa_emulation(&numa_meminfo, numa_distance_cnt); - ret = numa_register_memblks(&numa_meminfo); + ret = numa_check_memblks(&numa_meminfo); if (ret < 0) return ret; @@ -679,6 +672,11 @@ void __init x86_numa_init(void) early_x86_numa_init(); + for (i = 0; i < mi->nr_blks; i++) { + struct numa_memblk *mb = &mi->blk[i]; + memblock_set_node(mb->start, mb->end - mb->start, mb->nid); + } + /* Finally register nodes. */ for_each_node_mask(nid, node_possible_map) { u64 start = PFN_PHYS(max_pfn); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/