From a59a419c521808bf1261b4f8055af4ffcf86a868 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Fri, 5 Mar 2010 13:42:57 -0800
Subject: [PATCH] --- yaml --- r: 186252 b: refs/heads/master c:
 5ef097dd7ba4eab8b4f0026d85fcef9fe23b821f h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bede3ba9ab7c..1cb368d94bb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9728e5d6e6c432ee8487c63ce6e479e2474d9945
+refs/heads/master: 5ef097dd7ba4eab8b4f0026d85fcef9fe23b821f
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 6348d79401de..da2b31dc4e1c 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -556,8 +556,6 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
 	return 0;
 }
 
-#define EXTRA_STACK_VM_PAGES	20	/* random */
-
 /*
  * Finalizes the stack vm_area_struct. The flags and permissions are updated,
  * the stack is optionally relocated, and some extra space is added.
@@ -632,7 +630,7 @@ int setup_arg_pages(struct linux_binprm *bprm,
 			goto out_unlock;
 	}
 
-	stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
+	stack_expand = 131072UL; /* randomly 32*4k (or 2*64k) pages */
 	stack_size = vma->vm_end - vma->vm_start;
 	/*
 	 * Align this down to a page boundary as expand_stack