diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2021-01-26 15:35:13 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2021-01-26 15:35:13 +0100 |
| commit | b4478a080673958aa8b35d8de46ba7589c8fcc47 (patch) | |
| tree | c896b8272e0aad398e99ed98231775b7b474dd02 /mm/memory_hotplug.c | |
| parent | 3bbf9b89592d18c391eafd7a5e0e7429ae2dc767 (diff) | |
| parent | e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 (diff) | |
Merge tag 'v5.11-rc2' into devel
Linux 5.11-rc2
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index af41fb990820..f9d57b9be8c7 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, * expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ - memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, + memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, 0, MEMINIT_HOTPLUG, altmap, migratetype); set_zone_contiguous(zone); |