---

yaml --- r: 130974 b: refs/heads/master c: ab92661 h: refs/heads/master v: v3
git-mirror · Feb 5, 2009 · 17b0b8b · 17b0b8b
1 parent 7cf305e
commit 17b0b8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 777c6c5f1f6e757ae49ecca2ed72d6b1f523c007
+refs/heads/master: ab92661d5d9514647346047f30f67a7f35ffea67
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -1999,7 +1999,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * Don't let another task, with possibly unlocked vma,
 	 * keep the mlocked page.
 	 */
-	if (vma->vm_flags & VM_LOCKED) {
+	if ((vma->vm_flags & VM_LOCKED) && old_page) {
 		lock_page(old_page);	/* for LRU manipulation */
 		clear_page_mlock(old_page);
 		unlock_page(old_page);