diff options
author | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 |
commit | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (patch) | |
tree | 465d8631ade6c2fcbd7576ff9813d00116c6a1e8 /fs/binfmt_aout.c | |
parent | 0753ca7bc2b876dd136e9db11a20f85cbe4e08b1 (diff) | |
parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) | |
download | op-kernel-dev-53b2ec5518aa2623e8c0cb36f1c304a797988a46.zip op-kernel-dev-53b2ec5518aa2623e8c0cb36f1c304a797988a46.tar.gz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 dd9baab..7201182 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -318,7 +318,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) current->mm->free_area_cache = current->mm->mmap_base; current->mm->cached_hole_size = 0; - set_mm_counter(current->mm, rss, 0); current->mm->mmap = NULL; compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; |