diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 10:53:58 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 22:46:23 +0300 |
| commit | a8fc357b2875da8732c91eb085862a0648d82767 (patch) | |
| tree | f0c78fe50e93716475f91968dcbba9ff0d3166b4 /arch | |
| parent | a99583e780c751003ac9c0105eec9a3b23ec3bc4 (diff) | |
| download | linux-a8fc357b2875da8732c91eb085862a0648d82767.tar.xz | |
mm: split altmap memory map allocation from normal case
No functional changes, just untangling the call chain and document
why the altmap is passed around the hotplug code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 5 | ||||
| -rw-r--r-- | arch/x86/mm/init_64.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index db7d4e092157..7a2251d99ed3 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -200,7 +200,10 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, if (vmemmap_populated(start, page_size)) continue; - p = __vmemmap_alloc_block_buf(page_size, node, altmap); + if (altmap) + p = altmap_alloc_block_buf(page_size, altmap); + else + p = vmemmap_alloc_block_buf(page_size, node); if (!p) return -ENOMEM; diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 0cab4b5b59ba..1ab42c852069 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1385,7 +1385,10 @@ static int __meminit vmemmap_populate_hugepages(unsigned long start, if (pmd_none(*pmd)) { void *p; - p = __vmemmap_alloc_block_buf(PMD_SIZE, node, altmap); + if (altmap) + p = altmap_alloc_block_buf(PMD_SIZE, altmap); + else + p = vmemmap_alloc_block_buf(PMD_SIZE, node); if (p) { pte_t entry; |