1 files changed, 7 insertions, 5 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 4fa6d8fee730..be3ec9ae454e 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -967,11 +967,11 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
         unsigned long flags;
         unsigned long prot;
         int acc_mode;
-        unsigned long user_addr;
         struct ipc_namespace *ns;
         struct shm_file_data *sfd;
         struct path path;
         fmode_t f_mode;
+        unsigned long populate = 0;
 
         err = -EINVAL;
         if (shmid < 0)
@@ -1070,13 +1070,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
                         goto invalid;
         }
                 
-        user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0);
-        *raddr = user_addr;
+        addr = do_mmap_pgoff(file, addr, size, prot, flags, 0, &populate);
+        *raddr = addr;
         err = 0;
-        if (IS_ERR_VALUE(user_addr))
-                err = (long)user_addr;
+        if (IS_ERR_VALUE(addr))
+                err = (long)addr;
 invalid:
         up_write(&current->mm->mmap_sem);
+        if (populate)
+                mm_populate(addr, populate);
 
 out_fput:
         fput(file);