1 files changed, 12 insertions, 8 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 29501f040568..c47dffdcb246 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6686,16 +6686,20 @@ static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
                 pgoff = pte_to_pgoff(ptent);
 
         /* page is moved even if it's not RSS of this task(page-faulted). */
-        page = find_get_page(mapping, pgoff);
-
 #ifdef CONFIG_SWAP
         /* shmem/tmpfs may report page out on swap: account for that too. */
-        if (radix_tree_exceptional_entry(page)) {
-                swp_entry_t swap = radix_to_swp_entry(page);
-                if (do_swap_account)
-                        *entry = swap;
-                page = find_get_page(swap_address_space(swap), swap.val);
-        }
+        if (shmem_mapping(mapping)) {
+                page = find_get_entry(mapping, pgoff);
+                if (radix_tree_exceptional_entry(page)) {
+                        swp_entry_t swp = radix_to_swp_entry(page);
+                        if (do_swap_account)
+                                *entry = swp;
+                        page = find_get_page(swap_address_space(swp), swp.val);
+                }
+        } else
+                page = find_get_page(mapping, pgoff);
+#else
+        page = find_get_page(mapping, pgoff);
 #endif
         return page;
 }