diff options
author | Hugh Dickins <hugh@veritas.com> | 2005-10-29 21:16:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 00:40:38 -0400 |
commit | 404351e67a9facb475abf1492245374a28d13e90 (patch) | |
tree | 5ef4e78b399b36a46eda339ad0cd27556fc5b9a2 /arch | |
parent | fc2acab31be8e869b2d5f6de12f557f6f054f19c (diff) |
[PATCH] mm: mm_init set_mm_counters
How is anon_rss initialized? In dup_mmap, and by mm_alloc's memset; but
that's not so good if an mm_counter_t is a special type. And how is rss
initialized? By set_mm_counter, all over the place. Come on, we just need to
initialize them both at once by set_mm_counter in mm_init (which follows the
memcpy when forking).
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/irixelf.c | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/binfmt_aout32.c | 1 | ||||
-rw-r--r-- | arch/x86_64/ia32/ia32_aout.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index 99262fe64560..7ce34d4aa220 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c | |||
@@ -697,7 +697,6 @@ static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
697 | /* Do this so that we can load the interpreter, if need be. We will | 697 | /* Do this so that we can load the interpreter, if need be. We will |
698 | * change some of these later. | 698 | * change some of these later. |
699 | */ | 699 | */ |
700 | set_mm_counter(current->mm, rss, 0); | ||
701 | setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); | 700 | setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); |
702 | current->mm->start_stack = bprm->p; | 701 | current->mm->start_stack = bprm->p; |
703 | 702 | ||
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c index b2854ef221d0..edf52d06b280 100644 --- a/arch/sparc64/kernel/binfmt_aout32.c +++ b/arch/sparc64/kernel/binfmt_aout32.c | |||
@@ -241,7 +241,6 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
241 | current->mm->brk = ex.a_bss + | 241 | current->mm->brk = ex.a_bss + |
242 | (current->mm->start_brk = N_BSSADDR(ex)); | 242 | (current->mm->start_brk = N_BSSADDR(ex)); |
243 | 243 | ||
244 | set_mm_counter(current->mm, rss, 0); | ||
245 | current->mm->mmap = NULL; | 244 | current->mm->mmap = NULL; |
246 | compute_creds(bprm); | 245 | compute_creds(bprm); |
247 | current->flags &= ~PF_FORKNOEXEC; | 246 | current->flags &= ~PF_FORKNOEXEC; |
diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c index 3e6780fa0186..93c60f4aa47a 100644 --- a/arch/x86_64/ia32/ia32_aout.c +++ b/arch/x86_64/ia32/ia32_aout.c | |||
@@ -314,7 +314,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
314 | current->mm->free_area_cache = TASK_UNMAPPED_BASE; | 314 | current->mm->free_area_cache = TASK_UNMAPPED_BASE; |
315 | current->mm->cached_hole_size = 0; | 315 | current->mm->cached_hole_size = 0; |
316 | 316 | ||
317 | set_mm_counter(current->mm, rss, 0); | ||
318 | current->mm->mmap = NULL; | 317 | current->mm->mmap = NULL; |
319 | compute_creds(bprm); | 318 | compute_creds(bprm); |
320 | current->flags &= ~PF_FORKNOEXEC; | 319 | current->flags &= ~PF_FORKNOEXEC; |