---

yaml --- r: 180731 b: refs/heads/master c: a17e187 h: refs/heads/master i: 180729: d877adf 180727: 7db80d7 v: v3
git-mirror · Feb 23, 2010 · 48ef925 · 48ef925
1 parent e9c0c38
commit 48ef925
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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;