diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 08:53:57 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 11:46:23 -0800 |
| commit | a99583e780c751003ac9c0105eec9a3b23ec3bc4 (patch) | |
| tree | 084c7a60723639f7e9d61509f843b6eea0f70fb0 /arch/ia64 | |
| parent | 24b6d4164348370c6b6a58b4248babd85ff9e982 (diff) | |
| download | linux-a99583e780c751003ac9c0105eec9a3b23ec3bc4.tar.gz linux-a99583e780c751003ac9c0105eec9a3b23ec3bc4.tar.bz2 linux-a99583e780c751003ac9c0105eec9a3b23ec3bc4.zip | |
mm: pass the vmem_altmap to memmap_init_zone
Pass the vmem_altmap two levels down instead of needing a lookup.
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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 6a8ce9e1536e..18278b448530 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -501,7 +501,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg) if (map_start < map_end) memmap_init_zone((unsigned long)(map_end - map_start), args->nid, args->zone, page_to_pfn(map_start), - MEMMAP_EARLY); + MEMMAP_EARLY, NULL); return 0; } @@ -509,9 +509,10 @@ void __meminit memmap_init (unsigned long size, int nid, unsigned long zone, unsigned long start_pfn) { - if (!vmem_map) - memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY); - else { + if (!vmem_map) { + memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY, + NULL); + } else { struct page *start; struct memmap_init_callback_data args; |