diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /fs/binfmt_aout.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'fs/binfmt_aout.c')
| -rw-r--r-- | fs/binfmt_aout.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index e176d195e7e5..7596e1e94cde 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c | |||
| @@ -319,7 +319,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
| 319 | current->mm->free_area_cache = current->mm->mmap_base; | 319 | current->mm->free_area_cache = current->mm->mmap_base; |
| 320 | current->mm->cached_hole_size = 0; | 320 | current->mm->cached_hole_size = 0; |
| 321 | 321 | ||
| 322 | current->mm->mmap = NULL; | ||
| 323 | compute_creds(bprm); | 322 | compute_creds(bprm); |
| 324 | current->flags &= ~PF_FORKNOEXEC; | 323 | current->flags &= ~PF_FORKNOEXEC; |
| 325 | #ifdef __sparc__ | 324 | #ifdef __sparc__ |