From 9a925a1fedba158d30be357dfca25f5026436565 Mon Sep 17 00:00:00 2001
From: Lee Schermerhorn <lee.schermerhorn@hp.com>
Date: Sat, 29 Oct 2005 18:15:51 -0700
Subject: [PATCH] --- yaml --- r: 11324 b: refs/heads/master c:
 c340010e4bf824d969a89fa192ecc7a526c0cd24 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd1194c2f1ba..d9faa3038a41 100644
--- 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
index 843c87d1e61f..41d1064aabfb 100644
--- 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;
 		}