1 files changed, 2 insertions, 6 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 144b4a290f2c..724f342bcf89 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1165,12 +1165,8 @@ out:
                 mm->locked_vm += len >> PAGE_SHIFT;
                 make_pages_present(addr, addr + len);
         }
-        if (flags & MAP_POPULATE) {
-                up_write(&mm->mmap_sem);
-                sys_remap_file_pages(addr, len, 0,
-                                        pgoff, flags & MAP_NONBLOCK);
-                down_write(&mm->mmap_sem);
-        }
+        if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
+                make_pages_present(addr, addr + len);
         return addr;
 
 unmap_and_free_vma: