---

yaml --- r: 233144 b: refs/heads/master c: 419d8c9 h: refs/heads/master v: v3
git-mirror · Feb 12, 2011 · 4eb3943 · 4eb3943
1 parent a8afba6
commit 4eb3943
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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 {