path: root/mm/migrate.c
diff options
authorMatthew Wilcox (Oracle) <>2021-04-29 23:01:15 -0700
committerLinus Torvalds <>2021-04-30 11:20:42 -0700
commit84172f4bb752424415756351a40f8da5714e1554 (patch)
treedaf3da208d6fa979bf4e32ca8dfe61e6b87e3fe0 /mm/migrate.c
parent6e5e0f286eb0ecf12afaa3e73c321bc5bf599abb (diff)
mm/page_alloc: combine __alloc_pages and __alloc_pages_nodemask
There are only two callers of __alloc_pages() so prune the thicket of alloc_page variants by combining the two functions together. Current callers of __alloc_pages() simply add an extra 'NULL' parameter and current callers of __alloc_pages_nodemask() call __alloc_pages() instead. Link: Signed-off-by: Matthew Wilcox (Oracle) <> Acked-by: Vlastimil Babka <> Acked-by: Michal Hocko <> Cc: Mike Rapoport <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/migrate.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 62b81d5257aa..47df0df8f21a 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1617,7 +1617,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
if (is_highmem_idx(zidx) || zidx == ZONE_MOVABLE)
gfp_mask |= __GFP_HIGHMEM;
- new_page = __alloc_pages_nodemask(gfp_mask, order, nid, mtc->nmask);
+ new_page = __alloc_pages(gfp_mask, order, nid, mtc->nmask);
if (new_page && PageTransHuge(new_page))