Merge branch 'thinkpad-2.6.32-part2' into release

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

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