---

yaml --- r: 16842 b: refs/heads/master c: ee27497 h: refs/heads/master v: v3
git-mirror · Jan 9, 2006 · 4693163 · 4693163
1 parent 6a09dde
commit 4693163
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1480a540c98525640174a7eadd712378fcd6fd63
+refs/heads/master: ee27497df36823f2793212cad0997c044eb0e1eb
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -689,6 +689,11 @@ int migrate_pages(struct list_head *l, struct list_head *t)
 	list_for_each_entry_safe(page, page2, l, lru) {
 		cond_resched();
 
+		if (page_count(page) == 1) {
+			/* page was freed from under us. So we are done. */
+			move_to_lru(page);
+			continue;
+		}
 		/*
 		 * Skip locked pages during the first two passes to give the
 		 * functions holding the lock time to release the page. Later we