Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index ddfad445242cd1d07e9de25a91121c6c92fa5fe8..26d7bbf92249202f056dc8a2c0521b88bed572ff 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -538,7 +538,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
                if  ((shmflg & SHM_NORESERVE) &&
                                sysctl_overcommit_memory != OVERCOMMIT_NEVER)
                        acctflag = VM_NORESERVE;
-               file = shmem_file_setup(name, size, acctflag);
+               file = shmem_file_setup(name, size, acctflag, 0);
        }
        error = PTR_ERR(file);
        if (IS_ERR(file))