X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Fswapfile.c;h=90cb67a5417cccea9f0352b6316f747bec4c608d;hb=ec38fa2b35f13e7fa1d676a5bc997d0df1b02574;hp=2a97fafa3d89684c8fb6770650d91f905faa7a64;hpb=68a22394c286a2daf06ee8d65d8835f738faefa5;p=linux-2.6-omap-h63xx.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2a97fafa3d8..90cb67a5417 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -422,7 +422,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(!trylock_page(page))) {
+			if (page && !trylock_page(page)) {
 				page_cache_release(page);
 				page = NULL;
 			}