|
@@ -5635,7 +5635,12 @@ static struct page *
|
|
__alloc_contig_migrate_alloc(struct page *page, unsigned long private,
|
|
__alloc_contig_migrate_alloc(struct page *page, unsigned long private,
|
|
int **resultp)
|
|
int **resultp)
|
|
{
|
|
{
|
|
- return alloc_page(GFP_HIGHUSER_MOVABLE);
|
|
|
|
|
|
+ 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. */
|
|
/* [start, end) must belong to a single zone. */
|