X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fpage_alloc.c;h=ad8cb2fce1634b0d241f3e1930439a419ad92a36;hb=refs%2Fheads%2Fpandora-3.2-cma2;hp=0783d46bf896d2bf260ebf50de93bf0725eb02c8;hpb=bc25b2f1bbc6e8574770b2d78389c6bb3881a224;p=pandora-kernel.git

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0783d46bf896..ad8cb2fce163 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5922,7 +5922,12 @@ static struct page *
 __alloc_contig_migrate_alloc(struct page *page, unsigned long private,
 			     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. */