From: Hugh Dickins 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 Signed-off-by: Andrew Morton --- arch/mips/kernel/irixelf.c | 1 - arch/sparc64/kernel/binfmt_aout32.c | 1 - arch/x86_64/ia32/ia32_aout.c | 1 - fs/binfmt_aout.c | 1 - fs/binfmt_elf.c | 1 - fs/binfmt_elf_fdpic.c | 7 ------- fs/binfmt_flat.c | 1 - fs/binfmt_som.c | 1 - kernel/fork.c | 4 ++-- 9 files changed, 2 insertions(+), 16 deletions(-) diff -puN arch/mips/kernel/irixelf.c~mm-mm_init-set_mm_counters arch/mips/kernel/irixelf.c --- devel/arch/mips/kernel/irixelf.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irixelf.c 2005-09-25 15:31:22.000000000 -0700 @@ -692,7 +692,6 @@ static int load_irix_binary(struct linux /* Do this so that we can load the interpreter, if need be. We will * change some of these later. */ - set_mm_counter(current->mm, rss, 0); setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); current->mm->start_stack = bprm->p; diff -puN arch/sparc64/kernel/binfmt_aout32.c~mm-mm_init-set_mm_counters arch/sparc64/kernel/binfmt_aout32.c --- devel/arch/sparc64/kernel/binfmt_aout32.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/arch/sparc64/kernel/binfmt_aout32.c 2005-09-25 15:31:22.000000000 -0700 @@ -241,7 +241,6 @@ static int load_aout32_binary(struct lin current->mm->brk = ex.a_bss + (current->mm->start_brk = N_BSSADDR(ex)); - set_mm_counter(current->mm, rss, 0); current->mm->mmap = NULL; compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; diff -puN arch/x86_64/ia32/ia32_aout.c~mm-mm_init-set_mm_counters arch/x86_64/ia32/ia32_aout.c --- devel/arch/x86_64/ia32/ia32_aout.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/arch/x86_64/ia32/ia32_aout.c 2005-09-25 15:31:22.000000000 -0700 @@ -314,7 +314,6 @@ static int load_aout_binary(struct linux current->mm->free_area_cache = TASK_UNMAPPED_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; diff -puN fs/binfmt_aout.c~mm-mm_init-set_mm_counters fs/binfmt_aout.c --- devel/fs/binfmt_aout.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/fs/binfmt_aout.c 2005-09-25 15:31:22.000000000 -0700 @@ -318,7 +318,6 @@ static int load_aout_binary(struct linux 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; diff -puN fs/binfmt_elf.c~mm-mm_init-set_mm_counters fs/binfmt_elf.c --- devel/fs/binfmt_elf.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/fs/binfmt_elf.c 2005-09-25 15:31:22.000000000 -0700 @@ -773,7 +773,6 @@ static int load_elf_binary(struct linux_ /* Do this so that we can load the interpreter, if need be. We will change some of these later */ - set_mm_counter(current->mm, rss, 0); current->mm->free_area_cache = current->mm->mmap_base; current->mm->cached_hole_size = 0; retval = setup_arg_pages(bprm, randomize_stack_top(STACK_TOP), diff -puN fs/binfmt_elf_fdpic.c~mm-mm_init-set_mm_counters fs/binfmt_elf_fdpic.c --- devel/fs/binfmt_elf_fdpic.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/fs/binfmt_elf_fdpic.c 2005-09-25 15:31:22.000000000 -0700 @@ -294,14 +294,7 @@ static int load_elf_fdpic_binary(struct &interp_params, ¤t->mm->start_stack, ¤t->mm->start_brk); -#endif - - /* do this so that we can load the interpreter, if need be - * - we will change some of these later - */ - set_mm_counter(current->mm, rss, 0); -#ifdef CONFIG_MMU retval = setup_arg_pages(bprm, current->mm->start_stack, executable_stack); if (retval < 0) { send_sig(SIGKILL, current, 0); diff -puN fs/binfmt_flat.c~mm-mm_init-set_mm_counters fs/binfmt_flat.c --- devel/fs/binfmt_flat.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/fs/binfmt_flat.c 2005-09-25 15:31:22.000000000 -0700 @@ -650,7 +650,6 @@ static int load_flat_file(struct linux_b current->mm->start_brk = datapos + data_len + bss_len; current->mm->brk = (current->mm->start_brk + 3) & ~3; current->mm->context.end_brk = memp + ksize((void *) memp) - stack_len; - set_mm_counter(current->mm, rss, 0); } if (flags & FLAT_FLAG_KTRACE) diff -puN fs/binfmt_som.c~mm-mm_init-set_mm_counters fs/binfmt_som.c --- devel/fs/binfmt_som.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/fs/binfmt_som.c 2005-09-25 15:31:22.000000000 -0700 @@ -259,7 +259,6 @@ load_som_binary(struct linux_binprm * bp create_som_tables(bprm); current->mm->start_stack = bprm->p; - set_mm_counter(current->mm, rss, 0); #if 0 printk("(start_brk) %08lx\n" , (unsigned long) current->mm->start_brk); diff -puN kernel/fork.c~mm-mm_init-set_mm_counters kernel/fork.c --- devel/kernel/fork.c~mm-mm_init-set_mm_counters 2005-09-25 15:31:21.000000000 -0700 +++ devel-akpm/kernel/fork.c 2005-09-25 15:31:22.000000000 -0700 @@ -198,8 +198,6 @@ static inline int dup_mmap(struct mm_str mm->free_area_cache = oldmm->mmap_base; mm->cached_hole_size = ~0UL; mm->map_count = 0; - set_mm_counter(mm, rss, 0); - set_mm_counter(mm, anon_rss, 0); cpus_clear(mm->cpu_vm_mask); mm->mm_rb = RB_ROOT; rb_link = &mm->mm_rb.rb_node; @@ -323,6 +321,8 @@ static struct mm_struct * mm_init(struct INIT_LIST_HEAD(&mm->mmlist); mm->core_waiters = 0; mm->nr_ptes = 0; + set_mm_counter(mm, rss, 0); + set_mm_counter(mm, anon_rss, 0); spin_lock_init(&mm->page_table_lock); rwlock_init(&mm->ioctx_list_lock); mm->ioctx_list = NULL; _