diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 08:53:54 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 11:46:23 -0800 |
| commit | 7b73d978a5d0d2a3637bdd57191cb6ffbad3feca (patch) | |
| tree | dfcdd031e80b541ad356ccdc5edc171f9d202fe2 /arch/powerpc/mm/init_64.c | |
| parent | 24e6d5a59ac7d31adc0322de2d0117dfa370936f (diff) | |
| download | talos-op-linux-7b73d978a5d0d2a3637bdd57191cb6ffbad3feca.tar.gz talos-op-linux-7b73d978a5d0d2a3637bdd57191cb6ffbad3feca.zip | |
mm: pass the vmem_altmap to vmemmap_populate
We can just pass this on instead of having to do a radix tree lookup
without proper locking a few levels into the callchain.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/powerpc/mm/init_64.c')
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index a07722531b32..779b74a96b8f 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -183,7 +183,8 @@ static __meminit void vmemmap_list_populate(unsigned long phys, vmemmap_list = vmem_back; } -int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) +int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, + struct vmem_altmap *altmap) { unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift; @@ -193,16 +194,12 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node); for (; start < end; start += page_size) { - struct vmem_altmap *altmap; void *p; int rc; if (vmemmap_populated(start, page_size)) continue; - /* altmap lookups only work at section boundaries */ - altmap = to_vmem_altmap(SECTION_ALIGN_DOWN(start)); - p = __vmemmap_alloc_block_buf(page_size, node, altmap); if (!p) return -ENOMEM; |
