X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Fswapfile.c;h=1e330f2998fa259d2733f73f4c50ce0d649c5dc0;hb=9d11251709f31d49c8167a619d4475fdf6cd7f73;hp=bb7f79641f9e201274004bc9ffcd298956796936;hpb=00e9028a95fb8a4d79f2fb695a853f33ea7d3b57;p=linux-2.6-omap-h63xx.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index bb7f79641f9..1e330f2998f 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -403,7 +403,7 @@ void free_swap_and_cache(swp_entry_t entry)
 	if (p) {
 		if (swap_entry_free(p, swp_offset(entry)) == 1) {
 			page = find_get_page(&swapper_space, entry.val);
-			if (page && unlikely(TestSetPageLocked(page))) {
+			if (page && unlikely(!trylock_page(page))) {
 				page_cache_release(page);
 				page = NULL;
 			}