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 65a4512430c84f1c3607e867663a2c3025b3ba00..a11483123057d4781326c1116a422b9775682370 100644 (file)
--- 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;
 }
 
 /*