X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Fswap.c;h=9e0cb3118079e6eae0cf27fed41b8f2ff59f8bc2;hb=c197a8db59daf06dc5e77acd5a9681329cb22458;hp=7417a2adbe50f40130badaf92016bcb42e4bc9e2;hpb=57b1494d2ba544c62673234da6115c21fac27ffc;p=linux-2.6-omap-h63xx.git

diff --git a/mm/swap.c b/mm/swap.c
index 7417a2adbe5..9e0cb311807 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -444,7 +444,7 @@ void pagevec_strip(struct pagevec *pvec)
 	for (i = 0; i < pagevec_count(pvec); i++) {
 		struct page *page = pvec->pages[i];
 
-		if (PagePrivate(page) && !TestSetPageLocked(page)) {
+		if (PagePrivate(page) && trylock_page(page)) {
 			if (PagePrivate(page))
 				try_to_release_page(page, 0);
 			unlock_page(page);