From 4eb3943e242745cbc30afc7c3bba6debb0cb9879 Mon Sep 17 00:00:00 2001
From: Michel Lespinasse <walken@google.com>
Date: Thu, 10 Feb 2011 15:01:33 -0800
Subject: [PATCH] --- yaml --- r: 233144 b: refs/heads/master c:
 419d8c96dbfa558f00e623023917d0a5afc46129 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e3f937ccd1eb..4e46350add93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e15f8c01af924e611bc7be1e45449c4a74e5dfdd
+refs/heads/master: 419d8c96dbfa558f00e623023917d0a5afc46129
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 32df03cf13a5..8e8c18324863 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -3051,12 +3051,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 				goto out;
 			}
 			charged = 1;
-			/*
-			 * Don't let another task, with possibly unlocked vma,
-			 * keep the mlocked page.
-			 */
-			if (vma->vm_flags & VM_LOCKED)
-				clear_page_mlock(vmf.page);
 			copy_user_highpage(page, vmf.page, address, vma);
 			__SetPageUptodate(page);
 		} else {