diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /fs/exec.c | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -610,7 +610,7 @@ int setup_arg_pages(struct linux_binprm *bprm, | |||
| 610 | bprm->exec -= stack_shift; | 610 | bprm->exec -= stack_shift; |
| 611 | 611 | ||
| 612 | down_write(&mm->mmap_sem); | 612 | down_write(&mm->mmap_sem); |
| 613 | vm_flags = vma->vm_flags; | 613 | vm_flags = VM_STACK_FLAGS; |
| 614 | 614 | ||
| 615 | /* | 615 | /* |
| 616 | * Adjust stack execute permissions; explicitly enable for | 616 | * Adjust stack execute permissions; explicitly enable for |