From 48ef9250d81dd7b79015f5bb11cab0fd7bafd107 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Mon, 22 Feb 2010 12:44:24 -0800
Subject: [PATCH] --- yaml --- r: 180731 b: refs/heads/master c:
 a17e18790a8c47113a73139d54a375dc9ccd8f08 h: refs/heads/master i:   180729:
 d877adf4fa557532578dca3ae60d2a5829654f0c   180727:
 7db80d724735e03589280ee5cdb4f598653521cb v: v3

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

diff --git a/[refs] b/[refs]
index e1b958dee0e6..6b4f956323c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f3f2199084a160a3a45fa6d9af235696321758
+refs/heads/master: a17e18790a8c47113a73139d54a375dc9ccd8f08
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index e95c692ef0e4..cce6bbdbdbb1 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -637,7 +637,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
 	 * will align it up.
 	 */
 	rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
-	rlim_stack = min(rlim_stack, stack_size);
 #ifdef CONFIG_STACK_GROWSUP
 	if (stack_size + stack_expand > rlim_stack)
 		stack_base = vma->vm_start + rlim_stack;