diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
commit | 75ec4eb3dc84ee78533bd59bbb71992187bd86fd (patch) | |
tree | b75afe1763e5a21bfe508301562c037fbae2b04d /mm/page_alloc.c | |
parent | 19c5787a5ff88a959e5854ab6ddef7f5777c5837 (diff) | |
parent | 15670bfe19905b1dcbb63137f40d718b59d84479 (diff) | |
download | linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.tar.gz linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.tar.bz2 linux-75ec4eb3dc84ee78533bd59bbb71992187bd86fd.zip |
Merge branch 'x86/mm' into x86/asm, to pick up pending changes
Concentrate x86 MM and asm related changes into a single super-topic,
in preparation for larger changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 77e4d3c5c57b..8dfd13f724d9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5646,6 +5646,16 @@ void __init sparse_memory_present_with_active_regions(int nid) unsigned long start_pfn, end_pfn; int i, this_nid; +#ifdef CONFIG_SPARSEMEM_EXTREME + if (!mem_section) { + unsigned long size, align; + + size = sizeof(struct mem_section) * NR_SECTION_ROOTS; + align = 1 << (INTERNODE_CACHE_SHIFT); + mem_section = memblock_virt_alloc(size, align); + } +#endif + for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, &this_nid) memory_present(this_nid, start_pfn, end_pfn); } |