---

yaml --- r: 131283 b: refs/heads/master c: 508b9f8 h: refs/heads/master i: 131281: 107830f 131279: 0a9953c v: v3
git-mirror · Feb 11, 2009 · 19b905b · 19b905b
1 parent ee58671
commit 19b905b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ac597c9b86af49b2016aa98aee20ab59dbf0d2
+refs/heads/master: 508b9f8efdad123b202b228f71f59feba51e4fb5
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
@@ -1072,7 +1072,8 @@ static int try_to_unmap_file(struct page *page, int unlock, int migration)
 	spin_lock(&mapping->i_mmap_lock);
 	vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
 		if (MLOCK_PAGES && unlikely(unlock)) {
-			if (!(vma->vm_flags & VM_LOCKED))
+			if (!((vma->vm_flags & VM_LOCKED) &&
+						page_mapped_in_vma(page, vma)))
 				continue;	/* must visit all vmas */
 			ret = SWAP_MLOCK;
 		} else {