diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 09:49:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 09:49:13 +1000 |
| commit | a752e928c47bfd8bc6d539c162d1b8e69dd68d29 (patch) | |
| tree | 82bb97f739611639b0c65b86171f7fcef7742ca3 /fs | |
| parent | 11dc2b08e6dfa5c5064fbad66068474471e54c69 (diff) | |
| parent | ffe6902b66aaa4ca6694bc19639259c16d84ddb1 (diff) | |
Merge remote-tracking branch 'metag-fixes/fixes'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c index 476f3ebf437e..238b7aa26f68 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -657,10 +657,10 @@ int setup_arg_pages(struct linux_binprm *bprm, unsigned long rlim_stack; #ifdef CONFIG_STACK_GROWSUP - /* Limit stack size to 1GB */ + /* Limit stack size */ stack_base = rlimit_max(RLIMIT_STACK); - if (stack_base > (1 << 30)) - stack_base = 1 << 30; + if (stack_base > STACK_SIZE_MAX) + stack_base = STACK_SIZE_MAX; /* Make sure we didn't let the argument array grow too large. */ if (vma->vm_end - vma->vm_start > stack_base) |