git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mqueue: simplify do_open() error handling
[safe/jmp/linux-2.6]
/
fs
/
exec.c
diff --git
a/fs/exec.c
b/fs/exec.c
index
e95c692
..
cce6bbd
100644
(file)
--- a/
fs/exec.c
+++ b/
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;