Merge commit 'v2.6.26-rc9' into x86/cpu

1 files changed, 7 insertions, 1 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 669499e7c2f5..3354fdd83d4b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -245,10 +245,16 @@ asmlinkage unsigned long sys_brk(unsigned long brk)
         unsigned long rlim, retval;
         unsigned long newbrk, oldbrk;
         struct mm_struct *mm = current->mm;
+        unsigned long min_brk;
 
         down_write(&mm->mmap_sem);
 
-        if (brk < mm->start_brk)
+#ifdef CONFIG_COMPAT_BRK
+        min_brk = mm->end_code;
+#else
+        min_brk = mm->start_brk;
+#endif
+        if (brk < min_brk)
                 goto out;
 
         /*