From a18560184ba969efb078755276c57db16272db3e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 Nov 2009 16:52:36 -0500
Subject: [PATCH] --- yaml --- r: 174852 b: refs/heads/master c:
 570dcf2c15463842e384eb597a87c1e39bead99b h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/kernel/compat_linux.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7f280283ffc8..114b9b850fa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ea1d13f64efdf49319e86c87d9ba38c30902782
+refs/heads/master: 570dcf2c15463842e384eb597a87c1e39bead99b
diff --git a/trunk/arch/s390/kernel/compat_linux.c b/trunk/arch/s390/kernel/compat_linux.c
index 25c31d681402..11556aa6bf17 100644
--- a/trunk/arch/s390/kernel/compat_linux.c
+++ b/trunk/arch/s390/kernel/compat_linux.c
@@ -642,11 +642,6 @@ static inline long do_mmap2(
 
 	down_write(&current->mm->mmap_sem);
 	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	if (!IS_ERR((void *) error) && error + len >= 0x80000000ULL) {
-		/* Result is out of bounds.  */
-		do_munmap(current->mm, addr, len);
-		error = -ENOMEM;
-	}
 	up_write(&current->mm->mmap_sem);
 
 	if (file)