mm: direct previous __GFP_CMA allocations to offlinable memory

Ensure we continue to direct __GFP_CMA allocations to offlinable memory now
that __GFP_OFFLINABLE has been introduced.

Change-Id: Ibdd71e45f4e47110f3ec4d308d26ffae58beb300
Signed-off-by: Liam Mark <[email protected]>
This commit is contained in:
Liam Mark 2019-09-23 15:28:51 -07:00
commit 8b04672471
3 changed files with 11 additions and 12 deletions

View file

@ -1360,13 +1360,15 @@ compress_again:
__GFP_NOWARN |
__GFP_HIGHMEM |
__GFP_MOVABLE |
__GFP_CMA);
__GFP_CMA |
__GFP_OFFLINABLE);
if (!handle) {
zcomp_stream_put(zram->comp);
atomic64_inc(&zram->stats.writestall);
handle = zs_malloc(zram->mem_pool, comp_len,
GFP_NOIO | __GFP_HIGHMEM |
__GFP_MOVABLE | __GFP_CMA);
__GFP_MOVABLE | __GFP_CMA |
__GFP_OFFLINABLE);
if (handle)
goto compress_again;
return -ENOMEM;