Merge "mm: allocate swapin pages from movable zone"

This commit is contained in:
qctecmdr 2020-03-19 08:41:59 -07:00 committed by Gerrit - the friendly Code Review server
commit 8c06c7547e

View file

@ -3145,8 +3145,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
if (!page) {
if (skip_swapcache) {
page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma,
vmf->address);
page = alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_CMA,
vma, vmf->address);
if (page) {
__SetPageLocked(page);
__SetPageSwapBacked(page);