1 files changed, 5 insertions, 3 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index f8f69fad3a27..05d51d2a792c 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -340,6 +340,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
         struct file * file;
         char name[13];
         int id;
+        int acctflag = 0;
 
         if (size < SHMMIN || size > ns->shm_ctlmax)
                 return -EINVAL;
@@ -364,11 +365,12 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
 
         sprintf (name, "SYSV%08x", key);
         if (shmflg & SHM_HUGETLB) {
-                /* hugetlb_file_setup takes care of mlock user accounting */
-                file = hugetlb_file_setup(name, size);
+                /* hugetlb_file_setup applies strict accounting */
+                if (shmflg & SHM_NORESERVE)
+                        acctflag = VM_NORESERVE;
+                file = hugetlb_file_setup(name, size, acctflag);
                 shp->mlock_user = current_user();
         } else {
-                int acctflag = 0;
                 /*
                  * Do not allow no accounting for OVERCOMMIT_NEVER, even
                  * if it's asked for.