Merge "mm: allocate swapin pages from movable zone"

This commit is contained in:
qctecmdr 2020-07-10 21:39:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 92256f55c6

View file

@ -2986,8 +2986,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
if (si->flags & SWP_SYNCHRONOUS_IO &&
__swap_count(entry) == 1) {
/* 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);