diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 08:53:53 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 11:46:23 -0800 |
| commit | 24e6d5a59ac7d31adc0322de2d0117dfa370936f (patch) | |
| tree | b021d2de9c55ffda9054b36e8d76487c1c06f876 /arch/s390/mm/init.c | |
| parent | 55ce6e23ebd159bc3d8f0a20e27503e09b5d8138 (diff) | |
| download | linux-24e6d5a59ac7d31adc0322de2d0117dfa370936f.tar.gz linux-24e6d5a59ac7d31adc0322de2d0117dfa370936f.tar.bz2 linux-24e6d5a59ac7d31adc0322de2d0117dfa370936f.zip | |
mm: pass the vmem_altmap to arch_add_memory and __add_pages
We can just pass this on instead of having to do a radix tree lookup
without proper locking 2 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/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 671535e64aba..e12c5af50cd7 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -222,7 +222,8 @@ device_initcall(s390_cma_mem_init); #endif /* CONFIG_CMA */ -int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, + bool want_memblock) { unsigned long start_pfn = PFN_DOWN(start); unsigned long size_pages = PFN_DOWN(size); @@ -232,7 +233,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) if (rc) return rc; - rc = __add_pages(nid, start_pfn, size_pages, want_memblock); + rc = __add_pages(nid, start_pfn, size_pages, altmap, want_memblock); if (rc) vmem_remove_mapping(start, size); return rc; |