diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
| commit | 54ef76f37bcccf8c16fbaaed13c3c40825195958 (patch) | |
| tree | 59afdb95e68f2fbac2550aa42135921086649c38 /fs/exec.c | |
| parent | 032f82786f9be4635acaa5f77feca175a4ac5fe1 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into sched/devel
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 |