mm/memory_hotplug: introduce "auto-movable" online policy

[mirror_ubuntu-jammy-kernel.git] / mm / memremap.c

diff --git a/mm/memremap.c b/mm/memremap.c
index 15a074ffb8d73d5d71705d4e47f11c83ca98f77b..ed593bf87109a86403abf011f9652c4dda02a626 100644 (file)
--- a/mm/memremap.c
+++ b/mm/memremap.c
@@ -140,14 +140,11 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id)
 {
        struct range *range = &pgmap->ranges[range_id];
        struct page *first_page;
-       int nid;
 
        /* make sure to access a memmap that was actually initialized */
        first_page = pfn_to_page(pfn_first(pgmap, range_id));
 
        /* pages are dead and unused, undo the arch mapping */
-       nid = page_to_nid(first_page);
-
        mem_hotplug_begin();
        remove_pfn_range_from_zone(page_zone(first_page), PHYS_PFN(range->start),
                                   PHYS_PFN(range_len(range)));
@@ -155,7 +152,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id)
                __remove_pages(PHYS_PFN(range->start),
                               PHYS_PFN(range_len(range)), NULL);
        } else {
-               arch_remove_memory(nid, range->start, range_len(range),
+               arch_remove_memory(range->start, range_len(range),
                                pgmap_altmap(pgmap));
                kasan_remove_zero_shadow(__va(range->start), range_len(range));
        }