mm, memory_hotplug: add nid parameter to arch_remove_memory

[platform/kernel/linux-rpi.git] / kernel / memremap.c

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 3eef989..0d5603d 100644 (file)
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -87,6 +87,7 @@ static void devm_memremap_pages_release(void *data)
        struct resource *res = &pgmap->res;
        resource_size_t align_start, align_size;
        unsigned long pfn;
+       int nid;
 
        pgmap->kill(pgmap->ref);
        for_each_device_pfn(pfn, pgmap)
@@ -97,13 +98,15 @@ static void devm_memremap_pages_release(void *data)
        align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
                - align_start;
 
+       nid = page_to_nid(pfn_to_page(align_start >> PAGE_SHIFT));
+
        mem_hotplug_begin();
        if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
                pfn = align_start >> PAGE_SHIFT;
                __remove_pages(page_zone(pfn_to_page(pfn)), pfn,
                                align_size >> PAGE_SHIFT, NULL);
        } else {
-               arch_remove_memory(align_start, align_size,
+               arch_remove_memory(nid, align_start, align_size,
                                pgmap->altmap_valid ? &pgmap->altmap : NULL);
                kasan_remove_zero_shadow(__va(align_start), align_size);
        }