---

yaml --- r: 230969 b: refs/heads/master c: 1060f62 h: refs/heads/master i: 230967: c8ac429 v: v3
git-mirror · Jan 12, 2011 · 0793f9b · 0793f9b
1 parent 2c4e219
commit 0793f9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e0d48574ec371e26fa31e23d1d314f04e31eb3e
+refs/heads/master: 1060f62ea47e609b0c1672e8d1ac216e57f11a8e
diff --git a/trunk/arch/s390/mm/mmap.c b/trunk/arch/s390/mm/mmap.c
@@ -47,6 +47,15 @@ static unsigned long stack_maxrandom_size(void)
 #define MIN_GAP (32*1024*1024)
 #define MAX_GAP (STACK_TOP/6*5)
 
+static inline int mmap_is_legacy(void)
+{
+	if (current->personality & ADDR_COMPAT_LAYOUT)
+		return 1;
+	if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
+		return 1;
+	return sysctl_legacy_va_layout;
+}
+
 static inline unsigned long mmap_base(void)
 {
 	unsigned long gap = rlimit(RLIMIT_STACK);
@@ -59,15 +68,6 @@ static inline unsigned long mmap_base(void)
 	return STACK_TOP - stack_maxrandom_size() - (gap & PAGE_MASK);
 }
 
-static inline int mmap_is_legacy(void)
-{
-	if (current->personality & ADDR_COMPAT_LAYOUT)
-		return 1;
-	if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
-		return 1;
-	return sysctl_legacy_va_layout;
-}
-
 #ifndef CONFIG_64BIT
 
 /*