aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 32df03cf13a5..8e8c18324863 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3051,12 +3051,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
3051 goto out; 3051 goto out;
3052 } 3052 }
3053 charged = 1; 3053 charged = 1;
3054 /*
3055 * Don't let another task, with possibly unlocked vma,
3056 * keep the mlocked page.
3057 */
3058 if (vma->vm_flags & VM_LOCKED)
3059 clear_page_mlock(vmf.page);
3060 copy_user_highpage(page, vmf.page, address, vma); 3054 copy_user_highpage(page, vmf.page, address, vma);
3061 __SetPageUptodate(page); 3055 __SetPageUptodate(page);
3062 } else { 3056 } else {