diff --git a/[refs] b/[refs]
index 45d102184061..b0d5e924a77e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69bc70d4f97ce82153bed0afc9f432700c60390b
+refs/heads/master: fdf4c587a793ba87935e38e7f25a9540bc9a7b95
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
index 13e81ee8be9d..c3924c7f00be 100644
--- a/trunk/mm/mlock.c
+++ b/trunk/mm/mlock.c
@@ -178,6 +178,13 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
 	if ((vma->vm_flags & (VM_WRITE | VM_SHARED)) == VM_WRITE)
 		gup_flags |= FOLL_WRITE;
 
+	/*
+	 * We want mlock to succeed for regions that have any permissions
+	 * other than PROT_NONE.
+	 */
+	if (vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))
+		gup_flags |= FOLL_FORCE;
+
 	if (vma->vm_flags & VM_LOCKED)
 		gup_flags |= FOLL_MLOCK;