Merge "mm: Allow pages that are swapped in to come from the movable zone"

This commit is contained in:
qctecmdr 2020-08-19 22:51:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit dcf7c5cb14

View file

@ -2970,8 +2970,9 @@ 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 | __GFP_CMA,
vma, vmf->address);
page = alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_CMA
| __GFP_OFFLINABLE, vma,
vmf->address);
if (page) {
__SetPageLocked(page);
__SetPageSwapBacked(page);