From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 2 Jun 2021 03:53:01 +0000 (+1000)
Subject: mm-rmap-make-try_to_unmap-void-function-fix-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c27c556693ff49ed1eb86cea3fa1c27fc3facb25;p=users%2Fjedix%2Flinux-maple.git

mm-rmap-make-try_to_unmap-void-function-fix-fix

fix merge snafu

Cc: Hugh Dickins <hughd@google.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/mm/rmap.c b/mm/rmap.c
index 65a4512430c84..a11483123057d 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1674,8 +1674,6 @@ void try_to_unmap(struct page *page, enum ttu_flags flags)
 		rmap_walk_locked(page, &rwc);
 	else
 		rmap_walk(page, &rwc);
-
-	return !page_mapcount(page) ? true : false;
 }
 
 /*
@@ -1947,6 +1945,8 @@ bool try_to_migrate(struct page *page, enum ttu_flags flags)
 		rmap_walk_locked(page, &rwc);
 	else
 		rmap_walk(page, &rwc);
+
+	return !page_mapcount(page) ? true : false;
 }
 
 /*