diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-05 08:55:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-05 08:55:26 +0200 |
| commit | a944a1fb9a8286fb9e4bbd0180ebd53353c7f412 (patch) | |
| tree | 40c2c4354a0c86bc50e3d06e0eb2d4b96659b2dd /arch/ia64/mm/init.c | |
| parent | c95e48b275c9a26dbf9bd351d2e2ebf5e3dfe40d (diff) | |
| parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
Merge 5.9-rc8 into staging-next
We need the IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 0b3fb4c7af29..8e7b8c6c576e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -538,7 +538,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, NULL); + MEMINIT_EARLY, NULL); return 0; } @@ -547,8 +547,8 @@ 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, - NULL); + memmap_init_zone(size, nid, zone, start_pfn, + MEMINIT_EARLY, NULL); } else { struct page *start; struct memmap_init_callback_data args; |