Merge branch 'akpm/master'

[karo-tx-linux.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index dff40c9f73c9df09544c057f7325004726d27715..4fa6d8fee730c05e3fe4e4fbb93fa40690ede3bc 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -495,7 +495,8 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
                if (shmflg & SHM_NORESERVE)
                        acctflag = VM_NORESERVE;
                file = hugetlb_file_setup(name, 0, size, acctflag,
-                                       &shp->mlock_user, HUGETLB_SHMFS_INODE);
+                                 &shp->mlock_user, HUGETLB_SHMFS_INODE,
+                               (shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK);
        } else {
                /*
                 * Do not allow no accounting for OVERCOMMIT_NEVER, even