git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mm: record MAP_NORESERVE status on vmas and fix small page mprotect reservations
[safe/jmp/linux-2.6]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index
75e0d06
..
57d3b60
100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-1110,6
+1110,9
@@
munmap_back:
if (!may_expand_vm(mm, len >> PAGE_SHIFT))
return -ENOMEM;
+ if (flags & MAP_NORESERVE)
+ vm_flags |= VM_NORESERVE;
+
if (accountable && (!(flags & MAP_NORESERVE) ||
sysctl_overcommit_memory == OVERCOMMIT_NEVER)) {
if (vm_flags & VM_SHARED) {