Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/kernel/stable.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index a444e2d7dd2bffa3ffe496830a76395f21e7767e..431b1f6753c0b9e1a612ecc68b3d0c9b278593f0 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1841,6 +1841,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                struct migration_target_control mtc = {
                        .nmask = &nmask,
                        .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
+                       .reason = MR_MEMORY_HOTPLUG,
                };
                int ret;
 
@@ -2050,11 +2051,11 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
                }
 
                /*
-                * Dissolve free hugepages in the memory block before doing
+                * Dissolve free hugetlb folios in the memory block before doing
                 * offlining actually in order to make hugetlbfs's object
                 * counting consistent.
                 */
-               ret = dissolve_free_huge_pages(start_pfn, end_pfn);
+               ret = dissolve_free_hugetlb_folios(start_pfn, end_pfn);
                if (ret) {
                        reason = "failure to dissolve huge pages";
                        goto failed_removal_isolated;