Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages""

This reverts commit 00f0e834c44c492555e43fdaf9c112ed269db01f.

This patch from the rpi tree, commit [91c64870bb6f940011e723f4a7d499f7d40a2923]
For CMA allocation fail issue.

Change-Id: I6945dd5021c85ae9bbd911c5c8551c4395b8d6fd
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 023e12c6e5cb581e396be8f6da8b2980ca1cfcc6..9b31af7654d3fe1af9d90a023da4efd94f767acb 100644 (file)
--- 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);