mm: record MAP_NORESERVE status on vmas and fix small page mprotect reservations

[net-next-2.6.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 75e0d0673d78a3bf203e7ca8d0f632789d0c32c7..57d3b6097deb38e3f73d3319845681207b86c293 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) {