diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2018-02-14 01:08:16 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-30 23:34:26 +1100 |
commit | 9bd9be006c8ec0ccf7cb0422d35033af39d3f969 (patch) | |
tree | eb1c4052ff952eef7e9339d8bf1d8af3a2878db7 /arch/powerpc/mm/mem.c | |
parent | b575454fa330aab2d65cf17812ca8e1f405ae80d (diff) | |
download | linux-stable-9bd9be006c8ec0ccf7cb0422d35033af39d3f969.tar.gz linux-stable-9bd9be006c8ec0ccf7cb0422d35033af39d3f969.tar.bz2 linux-stable-9bd9be006c8ec0ccf7cb0422d35033af39d3f969.zip |
powerpc/mm/numa: move numa topology discovery earlier
Split sparsemem initialisation from basic numa topology discovery.
Move the parsing earlier in boot, before pacas are allocated.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index fe8c61149fb8..4eee46ea4d96 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -212,7 +212,7 @@ walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, EXPORT_SYMBOL_GPL(walk_system_ram_range); #ifndef CONFIG_NEED_MULTIPLE_NODES -void __init initmem_init(void) +void __init mem_topology_setup(void) { max_low_pfn = max_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT; min_low_pfn = MEMORY_START >> PAGE_SHIFT; @@ -224,7 +224,10 @@ void __init initmem_init(void) * memblock_regions */ memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); +} +void __init initmem_init(void) +{ /* XXX need to clip this if using highmem? */ sparse_memory_present_with_active_regions(0); sparse_init(); |