2.6.24-git15

 mm

diff --git a/mm/mmap.c b/mm/mmap.c
index 15678aa..bb4c963 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -36,6 +36,10 @@
 #define arch_mmap_check(addr, len, flags)   (0)
 #endif
 
+#ifndef arch_rebalance_pgtables
+#define arch_rebalance_pgtables(addr, len)      (addr)
+#endif
+
 static void unmap_region(struct mm_struct *mm,
       struct vm_area_struct *vma, struct vm_area_struct *prev,
       unsigned long start, unsigned long end);
@@ -251,7 +255,8 @@ asmlinkage unsigned long sys_brk(unsigned long brk)
     * not page aligned -Ram Gupta
     */
    rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
-   if (rlim < RLIM_INFINITY && brk - mm->start_data > rlim)
+   if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
+         (mm->end_data - mm->start_data) > rlim)
       goto out;
 
    newbrk = PAGE_ALIGN(brk);
@@ -1423,7 +1428,7 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
    if (addr & ~PAGE_MASK)
       return -EINVAL;
 
-   return addr;
+   return arch_rebalance_pgtables(addr, len);
 }
 
 EXPORT_SYMBOL(get_unmapped_area);
@@ -1620,7 +1625,7 @@ static inline int expand_downwards(struct vm_area_struct *vma,
       return -ENOMEM;
 
    address &= PAGE_MASK;
-   error = security_file_mmap(0, 0, 0, 0, address, 1);
+   error = security_file_mmap(NULL, 0, 0, 0, address, 1);
    if (error)
       return error;
 
@@ -1941,7 +1946,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
    if (is_hugepage_only_range(mm, addr, len))
       return -EINVAL;
 
-   error = security_file_mmap(0, 0, 0, 0, addr, 1);
+   error = security_file_mmap(NULL, 0, 0, 0, addr, 1);
    if (error)
       return error;
 
@@ -2215,7 +2220,7 @@ int install_special_mapping(struct mm_struct *mm,
    vma->vm_start = addr;
    vma->vm_end = addr + len;
 
-   vma->vm_flags = vm_flags | mm->def_flags;
+   vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
    vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
 
    vma->vm_ops = &special_mapping_vmops;