projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-block.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index 1bc4701ef4f0d2b214e57f73a1b1096d2f5346e1..30162a59621a03e0dab4c58d1102196928b56912 100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-410,7
+410,7
@@
static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
return error;
no_id:
- if (
shp->mlock_user) /* shmflg & SHM_HUGETLB case */
+ if (
is_file_hugepages(file) && shp->mlock_user)
user_shm_unlock(size, shp->mlock_user);
fput(file);
no_file: