diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 02:53:53 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 14:46:23 -0500 |
| commit | 24e6d5a59ac7d31adc0322de2d0117dfa370936f (patch) | |
| tree | b021d2de9c55ffda9054b36e8d76487c1c06f876 /arch/ia64 | |
| parent | 55ce6e23ebd159bc3d8f0a20e27503e09b5d8138 (diff) | |
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/ia64')
| -rw-r--r-- | arch/ia64/mm/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 7af4e05bb61e..2e2e4f532204 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -647,13 +647,14 @@ mem_init (void) | |||
| 647 | } | 647 | } |
| 648 | 648 | ||
| 649 | #ifdef CONFIG_MEMORY_HOTPLUG | 649 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 650 | int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) | 650 | int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, |
| 651 | bool want_memblock) | ||
| 651 | { | 652 | { |
| 652 | unsigned long start_pfn = start >> PAGE_SHIFT; | 653 | unsigned long start_pfn = start >> PAGE_SHIFT; |
| 653 | unsigned long nr_pages = size >> PAGE_SHIFT; | 654 | unsigned long nr_pages = size >> PAGE_SHIFT; |
| 654 | int ret; | 655 | int ret; |
| 655 | 656 | ||
| 656 | ret = __add_pages(nid, start_pfn, nr_pages, want_memblock); | 657 | ret = __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock); |
| 657 | if (ret) | 658 | if (ret) |
| 658 | printk("%s: Problem encountered in __add_pages() as ret=%d\n", | 659 | printk("%s: Problem encountered in __add_pages() as ret=%d\n", |
| 659 | __func__, ret); | 660 | __func__, ret); |
