Merge branch 'rpi-4.14.y' into mtx-4.14.y

mechatrax · Sep 18, 2018 · 3c67a56 · 3c67a56
2 parents 881a052 + 91c6487
commit 3c67a56
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
@@ -7527,6 +7527,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
 		.zone = page_zone(pfn_to_page(start)),
 		.mode = MIGRATE_SYNC,
 		.ignore_skip_hint = true,
+		.gfp_mask = current_gfp_context(gfp_mask),
 	};
 	INIT_LIST_HEAD(&cc.migratepages);