---

yaml --- r: 11324 b: refs/heads/master c: c340010 h: refs/heads/master v: v3
git-mirror · Oct 30, 2005 · 9a925a1 · 9a925a1
1 parent 765298b
commit 9a925a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b57b98d147ef98758886a39efb94f3254542c39b
+refs/heads/master: c340010e4bf824d969a89fa192ecc7a526c0cd24
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -417,7 +417,9 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc)
 		 * Anonymous process memory has backing store?
 		 * Try to allocate it some swap space here.
 		 */
-		if (PageAnon(page) && !PageSwapCache(page) && sc->may_swap) {
+		if (PageAnon(page) && !PageSwapCache(page)) {
+			if (!sc->may_swap)
+				goto keep_locked;
 			if (!add_to_swap(page))
 				goto activate_locked;
 		}