X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fmlock.c;h=c3924c7f00bead9d027b222e478a6a97462ac4c3;hb=HEAD;hp=13e81ee8be9d9b6a8d93b793c2dd837960b68a13;hpb=81c2bdb68855b29a4339313a6f0d07791b663ce7;p=mv-sheeva.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 13e81ee8be9..c3924c7f00b 100644
--- a/mm/mlock.c
+++ b/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;