From 87d9d080a29bdc11eba9d434ca6d263f133d47f4 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 5 Jun 2008 22:46:05 -0700
Subject: [PATCH] --- yaml --- r: 97788 b: refs/heads/master c:
 a5b4592cf77b973c29e7c9695873a26052b58951 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3579bf532ad8..225ff1ffe359 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33dda515a1995dfb3b6b57d7ace9b3ee9d449c11
+refs/heads/master: a5b4592cf77b973c29e7c9695873a26052b58951
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 669499e7c2f5..3354fdd83d4b 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/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;
 
 	/*