diff options
| author | Mike Rapoport <[email protected]> | 2020-08-07 06:24:02 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-08-07 18:33:27 +0000 |
| commit | c89ab04febf97d2db8ca4ef8e2866fadc474351b (patch) | |
| tree | 99a12f54aa9cabcdd0b1c0a91098cbbc29b04a3b /arch/powerpc/mm/numa.c | |
| parent | mm/sparse: only sub-section aligned range would be populated (diff) | |
| download | kernel-c89ab04febf97d2db8ca4ef8e2866fadc474351b.tar.gz kernel-c89ab04febf97d2db8ca4ef8e2866fadc474351b.zip | |
mm/sparse: cleanup the code surrounding memory_present()
After removal of CONFIG_HAVE_MEMBLOCK_NODE_MAP we have two equivalent
functions that call memory_present() for each region in memblock.memory:
sparse_memory_present_with_active_regions() and membocks_present().
Moreover, all architectures have a call to either of these functions
preceding the call to sparse_init() and in the most cases they are called
one after the other.
Mark the regions from memblock.memory as present during sparce_init() by
making sparse_init() call memblocks_present(), make memblocks_present()
and memory_present() functions static and remove redundant
sparse_memory_present_with_active_regions() function.
Also remove no longer required HAVE_MEMORY_PRESENT configuration option.
Signed-off-by: Mike Rapoport <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'arch/powerpc/mm/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 9fcf2d195830..03a81d65095b 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -949,7 +949,6 @@ void __init initmem_init(void) get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); setup_node_data(nid, start_pfn, end_pfn); - sparse_memory_present_with_active_regions(nid); } sparse_init(); |