diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:17:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:17:30 +1000 |
| commit | 0a3272d13407a32e178874f5796050532155db69 (patch) | |
| tree | 3c16ab5bbe25a459bf860e83fb0ddf3e4504a0e3 /fs/exec.c | |
| parent | bf16b328154fbfd826bad475c5e1c648e6b8dfa3 (diff) | |
| parent | 6bf1ea5826c782b3d8c6110c78656b99a67496d5 (diff) | |
Merge remote branch 'tip/auto-latest'
Conflicts:
Makefile
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index f2de04a01a2a..3eef42c6912a 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -653,6 +653,7 @@ int setup_arg_pages(struct linux_binprm *bprm, else stack_base = vma->vm_start - stack_expand; #endif + current->mm->start_stack = bprm->p; ret = expand_stack(vma, stack_base); if (ret) ret = -EFAULT; |