git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
[pandora-kernel.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index
30162a5
..
9eb1488
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