From 54c5a8d9ab98119f58baf274e773bd89345ebb6d Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Sat, 18 Oct 2008 20:26:58 -0700
Subject: [PATCH] --- yaml --- r: 115863 b: refs/heads/master c:
 a978d6f521063514812a7094dbe5036e056e4de3 h: refs/heads/master i:   115861:
 5f1fd5d57255afb755d1c7a08a24e581414effdb   115859:
 fecc202d8154060fe15ff883253aca195e619bce   115855:
 caddaf0535f334df44e62b84bddff523ce404667 v: v3

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

diff --git a/[refs] b/[refs]
index 5b0b2c57978f..4e8ca5e51c3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f45840b5c128445da70e7ec33adc47b4a12bdaf4
+refs/heads/master: a978d6f521063514812a7094dbe5036e056e4de3
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 412d7872fc75..3b5860294bb6 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -732,7 +732,14 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 		if (!mapping || !__remove_mapping(mapping, page))
 			goto keep_locked;
 
-		unlock_page(page);
+		/*
+		 * At this point, we have no other references and there is
+		 * no way to pick any more up (removed from LRU, removed
+		 * from pagecache). Can use non-atomic bitops now (and
+		 * we obviously don't have to worry about waking up a process
+		 * waiting on the page lock, because there are no references.
+		 */
+		__clear_page_locked(page);
 free_it:
 		nr_reclaimed++;
 		if (!pagevec_add(&freed_pvec, page)) {