3 files changed, 14 insertions, 14 deletions

diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index fca8c0a5c188..76a9539cfd3f 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -41,6 +41,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
  */
 int set_migratetype_isolate(struct page *page);
 void unset_migratetype_isolate(struct page *page, unsigned migratetype);
-
+struct page *alloc_migrate_target(struct page *page, unsigned long private,
+                                int **resultp);
 
 #endif
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b97cf12f07a9..8ac593893e6e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5667,18 +5667,6 @@ static unsigned long pfn_max_align_up(unsigned long pfn)
                                 pageblock_nr_pages));
 }
 
-static struct page *
-__alloc_contig_migrate_alloc(struct page *page, unsigned long private,
-                             int **resultp)
-{
-        gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
-
-        if (PageHighMem(page))
-                gfp_mask |= __GFP_HIGHMEM;
-
-        return alloc_page(gfp_mask);
-}
-
 /* [start, end) must belong to a single zone. */
 static int __alloc_contig_migrate_range(struct compact_control *cc,
                                         unsigned long start, unsigned long end)
@@ -5714,7 +5702,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
                 reclaim_clean_pages_from_list(cc->zone, &cc->migratepages);
 
                 ret = migrate_pages(&cc->migratepages,
-                                    __alloc_contig_migrate_alloc,
+                                    alloc_migrate_target,
                                     0, false, MIGRATE_SYNC);
         }
 
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 5f34a9053ce0..f2f5b4818e94 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -255,3 +255,14 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
         spin_unlock_irqrestore(&zone->lock, flags);
         return ret ? 0 : -EBUSY;
 }
+
+struct page *alloc_migrate_target(struct page *page, unsigned long private,
+                                  int **resultp)
+{
+        gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
+
+        if (PageHighMem(page))
+                gfp_mask |= __GFP_HIGHMEM;
+
+        return alloc_page(gfp_mask);
+}