diff --git a/[refs] b/[refs]
index 471da25805a5..3265ae66a242 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7828bbd5e8b7c8d6480d1eb744af821989ca432
+refs/heads/master: 7e0d48574ec371e26fa31e23d1d314f04e31eb3e
diff --git a/trunk/arch/s390/mm/mmap.c b/trunk/arch/s390/mm/mmap.c
index 89eff9e7b0b5..ab7e08a01b6c 100644
--- a/trunk/arch/s390/mm/mmap.c
+++ b/trunk/arch/s390/mm/mmap.c
@@ -61,16 +61,11 @@ static inline unsigned long mmap_base(void)
 
 static inline int mmap_is_legacy(void)
 {
-#ifdef CONFIG_64BIT
-	/*
-	 * Force standard allocation for 64 bit programs.
-	 */
-	if (!is_compat_task())
+	if (current->personality & ADDR_COMPAT_LAYOUT)
 		return 1;
-#endif
-	return sysctl_legacy_va_layout ||
-	    (current->personality & ADDR_COMPAT_LAYOUT) ||
-	    rlimit(RLIMIT_STACK) == RLIM_INFINITY;
+	if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
+		return 1;
+	return sysctl_legacy_va_layout;
 }
 
 #ifndef CONFIG_64BIT