mm/page_alloc: refactor out __alloc_contig_migrate_alloc()

__alloc_contig_migrate_alloc() can be used by memory-hotplug so refactor
it out (move + rename as a common name) into page_isolation.c.

Signed-off-by: Minchan Kim <minchan@kernel.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Wen Congyang <wency@cn.fujitsu.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 fca8c0a5c1883d6079d39d5e11a7ca0b9fc4bc39..76a9539cfd3f629403b66e2daaf9c6b5ffbcef1b 100644 (file)
--- 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 a160479fe1f49368f4ac1195fd739180a6d4321a..cfac9698926e551f28eb9455b59d7c69efb8d7fc 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5653,18 +5653,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(unsigned long start, unsigned long end)
 {
@@ -5707,7 +5695,7 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end)
                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 be3c37ae714e3b972f3e0a0c776e9f6e9eee83e6..93ba869d8beccf13cbbdaaee3a871fbaf7a1ec75 100644 (file)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -248,3 +248,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);
+}