mm/page_isolation: don't pass gfp flags to start_isolate_page_range()

The parameter is unused, so let's stop passing it.

Link: https://lkml.kernel.org/r/20241203094732.200195-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index 73dc2c1841ec13c51b1526279d57134294ca982b..898bb788243b29b9a54bd4c24ee39490213682b7 100644 (file)
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -31,7 +31,7 @@ bool move_freepages_block_isolate(struct zone *zone, struct page *page,
                                  int migratetype);
 
 int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
-                            int migratetype, int flags, gfp_t gfp_flags);
+                            int migratetype, int flags);
 
 void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
                             int migratetype);

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 20af14e695c795bbebafe5a7c966ac7ed78dc205..5f497ccf473d7cde2594d76fa1fa254ae08d0e92 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -2000,8 +2000,7 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages,
        /* set above range as isolated */
        ret = start_isolate_page_range(start_pfn, end_pfn,
                                       MIGRATE_MOVABLE,
-                                      MEMORY_OFFLINE | REPORT_FAILURE,
-                                      GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL);
+                                      MEMORY_OFFLINE | REPORT_FAILURE);
        if (ret) {
                reason = "failure to isolate range";
                goto failed_removal_pcplists_disabled;

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 75de3711784eea0b671acc577f564ce27ffeab31..98ffcd2bf153adfb1576a7562cd4cc2b31e01cdd 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6447,7 +6447,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end,
         * put back to page allocator so that buddy can use them.
         */
 
-       ret = start_isolate_page_range(start, end, migratetype, 0, gfp_mask);
+       ret = start_isolate_page_range(start, end, migratetype, 0);
        if (ret)
                goto done;
 

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index e680d40d96de1a0a791ab788cff7410e37531418..c608e9d728655c6ab9f4935cfccfda524a5490a2 100644 (file)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -442,8 +442,6 @@ failed:
  *                                      and PageOffline() pages.
  *                     REPORT_FAILURE - report details about the failure to
  *                     isolate the range
- * @gfp_flags:         GFP flags used for migrating pages that sit across the
- *                     range boundaries.
  *
  * Making page-allocation-type to be MIGRATE_ISOLATE means free pages in
  * the range will never be allocated. Any free pages and pages freed in the
@@ -476,7 +474,7 @@ failed:
  * Return: 0 on success and -EBUSY if any part of range cannot be isolated.
  */
 int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
-                            int migratetype, int flags, gfp_t gfp_flags)
+                            int migratetype, int flags)
 {
        unsigned long pfn;
        struct page *page;