Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcf7c5cb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents d0eb3083 84d7f52b

mm/memory.c

+3 −2
Original line number Diff line number Diff line
@@ -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);