X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2Fmemory.c;h=4bf0b6d0eb2a675bbd1083099448d54979dff304;hb=d89a9bda14204547f966ed1510a269a44c0b7f5d;hp=9791e4786843f40438a97910728ec580664d1d4e;hpb=64c911a3f7c9864a4bbddbb77b722d5553ddcd32;p=mirror_ubuntu-bionic-kernel.git

diff --git a/mm/memory.c b/mm/memory.c
index 9791e4786843..4bf0b6d0eb2a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1036,7 +1036,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 
 		if (is_vm_hugetlb_page(vma)) {
 			i = follow_hugetlb_page(mm, vma, pages, vmas,
-						&start, &len, i);
+						&start, &len, i, write);
 			continue;
 		}
 
@@ -2084,9 +2084,9 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		count_vm_event(PGMAJFAULT);
 	}
 
-	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 	mark_page_accessed(page);
 	lock_page(page);
+	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 
 	/*
 	 * Back out if somebody else already faulted in this pte.