X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fmlock.c;h=c483c5c20b4bd12bcca50972c9f74a0dbd3a713e;hb=a8fad984833832d5ca11a9ed64ddc55646da30e3;hp=0dd9ca18e19ed7ddb499a480c5831c312791b10a;hpb=2a4e669dd611855d89d938063c10f44cb67ce65d;p=karo-tx-linux.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 0dd9ca18e19e..c483c5c20b4b 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -123,17 +123,15 @@ static bool __munlock_isolate_lru_page(struct page *page, bool getpage)
  */
 static void __munlock_isolated_page(struct page *page)
 {
-	int ret = SWAP_AGAIN;
-
 	/*
 	 * Optimization: if the page was mapped just once, that's our mapping
 	 * and we don't need to check all the other vmas.
 	 */
 	if (page_mapcount(page) > 1)
-		ret = try_to_munlock(page);
+		try_to_munlock(page);
 
 	/* Did try_to_unlock() succeed or punt? */
-	if (ret != SWAP_MLOCK)
+	if (!PageMlocked(page))
 		count_vm_event(UNEVICTABLE_PGMUNLOCKED);
 
 	putback_lru_page(page);