X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Fmemory.c;h=baa999e87cd21d2f9e67c8e3b1093bb6831513fb;hb=f54b2fe4aef9aa74ddf2c856928c3e29f3371fe7;hp=22bfa7a47a0b613cf9c39ee6e7d24f7dc3c9cf77;hpb=7df0eb424d7f5bfb948c921500e0470f4a27c4cb;p=~andy%2Flinux

diff --git a/mm/memory.c b/mm/memory.c
index 22bfa7a47a0..baa999e87cd 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1999,7 +1999,7 @@ gotten:
 	 * 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);