From 6dae69561a64eb10ba3010f19cdff725e9f7a95e Mon Sep 17 00:00:00 2001
From: Michel Lespinasse <walken@google.com>
Date: Mon, 31 Jan 2011 17:03:41 -0800
Subject: [PATCH] --- yaml --- r: 232703 b: refs/heads/master c:
 fdf4c587a793ba87935e38e7f25a9540bc9a7b95 h: refs/heads/master i:   232701:
 10284808b2a50410059c364c9fcf51252b5767e9   232699:
 2455af4b10ad128e33380bc43d881a07b5b863f1   232695:
 4ead36cc8088e9ef2cef9a1fed1442cd350f2636   232687:
 6fb5aed996457d22ec1871aa2a51a814566eb415   232671:
 a0477103f054b391e95218514361ca65e1ad5fa3   232639:
 48c56eb32927253c62d9521a5b32f3d6df4805d8   232575:
 e24fe51527f732d6ebfd18d42352807ea0e1338c   232447:
 c9e3efae039dad850c8117e4999ba1bb8fc467e6 v: v3

---
 [refs]           | 2 +-
 trunk/mm/mlock.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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;