浏览代码

[S390] Enable flexible mmap layout for 64 bit processes

Historically 64 bit processes use the legacy address layout. However
there is no reason why 64 bit processes shouldn't benefit from the
flexible mmap layout advantages.
Therefore just enable it.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Heiko Carstens 15 年之前
父节点
当前提交
7e0d48574e
共有 1 个文件被更改,包括 4 次插入9 次删除
  1. 4 9
      arch/s390/mm/mmap.c

+ 4 - 9
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