diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/i386/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/i386/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/i386/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/i386/mm/hugetlbpage.c 2005-05-21 15:55:45.000000000 +0200 @@ -46,7 +46,6 @@ static void set_huge_pte(struct mm_struc { pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) { entry = @@ -87,7 +86,6 @@ int copy_hugetlb_page_range(struct mm_st ptepage = pte_page(entry); get_page(ptepage); set_pte(dst_pte, entry); - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); addr += HPAGE_SIZE; } @@ -224,7 +222,6 @@ void unmap_hugepage_range(struct vm_area page = pte_page(pte); put_page(page); } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_range(vma, start, end); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/ia32/binfmt_elf32.c --- linux-2.6.11.9-vs2.0-rc1/arch/ia64/ia32/binfmt_elf32.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/ia32/binfmt_elf32.c 2005-05-21 15:56:12.000000000 +0200 @@ -244,7 +244,6 @@ ia32_setup_arg_pages (struct linux_binpr kmem_cache_free(vm_area_cachep, mpnt); return ret; } - // current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt); vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt)); current->mm->stack_vm = current->mm->total_vm; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/ia64/kernel/perfmon.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/kernel/perfmon.c --- linux-2.6.11.9-vs2.0-rc1/arch/ia64/kernel/perfmon.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/kernel/perfmon.c 2005-05-21 15:56:41.000000000 +0200 @@ -2341,7 +2341,6 @@ pfm_smpl_buffer_alloc(struct task_struct */ insert_vm_struct(mm, vma); - // mm->total_vm += size >> PAGE_SHIFT; vx_vmpages_add(mm, size >> PAGE_SHIFT); vm_stat_account(vma); up_write(&task->mm->mmap_sem); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/ia64/mm/fault.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/mm/fault.c --- linux-2.6.11.9-vs2.0-rc1/arch/ia64/mm/fault.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/mm/fault.c 2005-05-21 15:57:07.000000000 +0200 @@ -42,10 +42,8 @@ expand_backing_store (struct vm_area_str !vx_vmlocked_avail(vma->vm_mm, grow))) return -ENOMEM; vma->vm_end += PAGE_SIZE; - // vma->vm_mm->total_vm += grow; vx_vmpages_add(vma->vm_mm, grow); if (vma->vm_flags & VM_LOCKED) - // vma->vm_mm->locked_vm += grow; vx_vmlocked_add(vma->vm_mm, grow); __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow); return 0; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/ia64/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/ia64/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ia64/mm/hugetlbpage.c 2005-05-21 15:57:16.000000000 +0200 @@ -73,7 +73,6 @@ set_huge_pte (struct mm_struct *mm, stru { pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) { entry = @@ -117,7 +116,6 @@ int copy_hugetlb_page_range(struct mm_st ptepage = pte_page(entry); get_page(ptepage); set_pte(dst_pte, entry); - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); addr += HPAGE_SIZE; } @@ -248,7 +246,6 @@ void unmap_hugepage_range(struct vm_area put_page(page); pte_clear(pte); } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_range(vma, start, end); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/m68k/atari/stram.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/m68k/atari/stram.c --- linux-2.6.11.9-vs2.0-rc1/arch/m68k/atari/stram.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/m68k/atari/stram.c 2005-05-21 15:57:34.000000000 +0200 @@ -635,7 +635,6 @@ static inline void unswap_pte(struct vm_ set_pte(dir, pte_mkdirty(mk_pte(page, vma->vm_page_prot))); swap_free(entry); get_page(page); - // ++vma->vm_mm->rss; vx_rsspages_inc(vma->vm_mm); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/mips/kernel/irixelf.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/mips/kernel/irixelf.c --- linux-2.6.11.9-vs2.0-rc1/arch/mips/kernel/irixelf.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/mips/kernel/irixelf.c 2005-05-21 15:57:51.000000000 +0200 @@ -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. */ - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); current->mm->start_stack = bprm->p; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/ppc64/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ppc64/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/ppc64/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/ppc64/mm/hugetlbpage.c 2005-05-21 15:58:07.000000000 +0200 @@ -153,7 +153,6 @@ static void set_huge_pte(struct mm_struc { pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) { entry = @@ -316,7 +315,6 @@ int copy_hugetlb_page_range(struct mm_st ptepage = pte_page(entry); get_page(ptepage); - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); set_pte(dst_pte, entry); @@ -427,7 +425,6 @@ void unmap_hugepage_range(struct vm_area put_page(page); } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_pending(); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/sh/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sh/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/sh/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sh/mm/hugetlbpage.c 2005-05-21 15:58:26.000000000 +0200 @@ -62,7 +62,6 @@ static void set_huge_pte(struct mm_struc unsigned long i; pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) @@ -116,7 +115,6 @@ int copy_hugetlb_page_range(struct mm_st pte_val(entry) += PAGE_SIZE; dst_pte++; } - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); addr += HPAGE_SIZE; } @@ -208,7 +206,6 @@ void unmap_hugepage_range(struct vm_area pte++; } } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_range(vma, start, end); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/sh64/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sh64/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/sh64/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sh64/mm/hugetlbpage.c 2005-05-21 15:58:40.000000000 +0200 @@ -62,7 +62,6 @@ static void set_huge_pte(struct mm_struc unsigned long i; pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) entry = pte_mkwrite(pte_mkdirty(mk_pte(page, @@ -115,7 +114,6 @@ int copy_hugetlb_page_range(struct mm_st pte_val(entry) += PAGE_SIZE; dst_pte++; } - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); addr += HPAGE_SIZE; } @@ -207,7 +205,6 @@ void unmap_hugepage_range(struct vm_area pte++; } } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_range(vma, start, end); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sparc64/kernel/binfmt_aout32.c --- linux-2.6.11.9-vs2.0-rc1/arch/sparc64/kernel/binfmt_aout32.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sparc64/kernel/binfmt_aout32.c 2005-05-21 15:59:02.000000000 +0200 @@ -242,7 +242,6 @@ static int load_aout32_binary(struct lin current->mm->brk = ex.a_bss + (current->mm->start_brk = N_BSSADDR(ex)); - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); current->mm->mmap = NULL; compute_creds(bprm); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/sparc64/mm/hugetlbpage.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sparc64/mm/hugetlbpage.c --- linux-2.6.11.9-vs2.0-rc1/arch/sparc64/mm/hugetlbpage.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/sparc64/mm/hugetlbpage.c 2005-05-21 15:59:21.000000000 +0200 @@ -67,7 +67,6 @@ static void set_huge_pte(struct mm_struc unsigned long i; pte_t entry; - // mm->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE); if (write_access) @@ -121,7 +120,6 @@ int copy_hugetlb_page_range(struct mm_st pte_val(entry) += PAGE_SIZE; dst_pte++; } - // dst->rss += (HPAGE_SIZE / PAGE_SIZE); vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE); addr += HPAGE_SIZE; } @@ -213,7 +211,6 @@ void unmap_hugepage_range(struct vm_area pte++; } } - // mm->rss -= (end - start) >> PAGE_SHIFT; vx_rsspages_sub(mm, (end - start) >> PAGE_SHIFT); flush_tlb_range(vma, start, end); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/x86_64/ia32/ia32_aout.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/x86_64/ia32/ia32_aout.c --- linux-2.6.11.9-vs2.0-rc1/arch/x86_64/ia32/ia32_aout.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/x86_64/ia32/ia32_aout.c 2005-05-21 15:59:36.000000000 +0200 @@ -314,7 +314,6 @@ static int load_aout_binary(struct linux (current->mm->start_brk = N_BSSADDR(ex)); current->mm->free_area_cache = TASK_UNMAPPED_BASE; - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); current->mm->mmap = NULL; compute_creds(bprm); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.11.9-vs2.0-rc1-rem-com/arch/x86_64/ia32/ia32_binfmt.c --- linux-2.6.11.9-vs2.0-rc1/arch/x86_64/ia32/ia32_binfmt.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/arch/x86_64/ia32/ia32_binfmt.c 2005-05-21 15:59:53.000000000 +0200 @@ -381,7 +381,6 @@ int setup_arg_pages(struct linux_binprm kmem_cache_free(vm_area_cachep, mpnt); return ret; } - // mm->stack_vm = mm->total_vm = vma_pages(mpnt); vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt)); mm->stack_vm = mm->total_vm; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/binfmt_aout.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_aout.c --- linux-2.6.11.9-vs2.0-rc1/fs/binfmt_aout.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_aout.c 2005-05-21 16:00:09.000000000 +0200 @@ -318,7 +318,6 @@ static int load_aout_binary(struct linux (current->mm->start_brk = N_BSSADDR(ex)); current->mm->free_area_cache = current->mm->mmap_base; - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); current->mm->mmap = NULL; compute_creds(bprm); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/binfmt_elf.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_elf.c --- linux-2.6.11.9-vs2.0-rc1/fs/binfmt_elf.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_elf.c 2005-05-21 16:00:47.000000000 +0200 @@ -765,7 +765,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 */ - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); current->mm->free_area_cache = current->mm->mmap_base; retval = setup_arg_pages(bprm, STACK_TOP, executable_stack); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/binfmt_elf_fdpic.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_elf_fdpic.c --- linux-2.6.11.9-vs2.0-rc1/fs/binfmt_elf_fdpic.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_elf_fdpic.c 2005-05-21 16:01:13.000000000 +0200 @@ -299,7 +299,6 @@ static int load_elf_fdpic_binary(struct /* do this so that we can load the interpreter, if need be * - we will change some of these later */ - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); #ifdef CONFIG_MMU diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/binfmt_flat.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_flat.c --- linux-2.6.11.9-vs2.0-rc1/fs/binfmt_flat.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_flat.c 2005-05-21 16:01:43.000000000 +0200 @@ -651,7 +651,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; - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/binfmt_som.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_som.c --- linux-2.6.11.9-vs2.0-rc1/fs/binfmt_som.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/binfmt_som.c 2005-05-21 16:01:55.000000000 +0200 @@ -260,7 +260,6 @@ load_som_binary(struct linux_binprm * bp create_som_tables(bprm); current->mm->start_stack = bprm->p; - // current->mm->rss = 0; vx_rsspages_sub(current->mm, current->mm->rss); #if 0 diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/exec.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/exec.c --- linux-2.6.11.9-vs2.0-rc1/fs/exec.c 2005-05-15 03:52:40.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/exec.c 2005-05-21 16:02:07.000000000 +0200 @@ -327,7 +327,6 @@ void install_arg_page(struct vm_area_str pte_unmap(pte); goto out; } - // mm->rss++; vx_rsspages_inc(mm); lru_cache_add_active(page); set_pte(pte, pte_mkdirty(pte_mkwrite(mk_pte( @@ -452,7 +451,6 @@ int setup_arg_pages(struct linux_binprm kmem_cache_free(vm_area_cachep, mpnt); return ret; } - // mm->stack_vm = mm->total_vm = vma_pages(mpnt); vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt)); mm->stack_vm = mm->total_vm; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/file_table.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/file_table.c --- linux-2.6.11.9-vs2.0-rc1/fs/file_table.c 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/file_table.c 2005-05-21 16:02:31.000000000 +0200 @@ -87,7 +87,6 @@ static int old_max; rwlock_init(&f->f_owner.lock); /* f->f_version: 0 */ INIT_LIST_HEAD(&f->f_list); - // set_vx_info(&f->f_vx_info, current->vx_info); f->f_xid = vx_current_xid(); vx_files_inc(f); f->f_maxcount = INT_MAX; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/fs/inode.c linux-2.6.11.9-vs2.0-rc1-rem-com/fs/inode.c --- linux-2.6.11.9-vs2.0-rc1/fs/inode.c 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/fs/inode.c 2005-05-21 16:03:05.000000000 +0200 @@ -115,7 +115,6 @@ static struct inode *alloc_inode(struct struct address_space * const mapping = &inode->i_data; inode->i_sb = sb; - // inode->i_dqh = dqhget(sb->s_dqh); /* essential because of inode slab reuse */ inode->i_xid = 0; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/asm-arm/tlb.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-arm/tlb.h --- linux-2.6.11.9-vs2.0-rc1/include/asm-arm/tlb.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-arm/tlb.h 2005-05-21 16:03:32.000000000 +0200 @@ -59,7 +59,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, u if (rss < freed) freed = rss; - // mm->rss = rss - freed; vx_rsspages_sub(mm, freed); if (freed) { diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/asm-arm26/tlb.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-arm26/tlb.h --- linux-2.6.11.9-vs2.0-rc1/include/asm-arm26/tlb.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-arm26/tlb.h 2005-05-21 16:03:48.000000000 +0200 @@ -42,7 +42,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, u if (rss < freed) freed = rss; - // mm->rss = rss - freed; vx_rsspages_sub(mm, freed); if (freed) { diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/asm-generic/tlb.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-generic/tlb.h --- linux-2.6.11.9-vs2.0-rc1/include/asm-generic/tlb.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-generic/tlb.h 2005-05-21 16:04:01.000000000 +0200 @@ -93,7 +93,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, u if (rss < freed) freed = rss; - // mm->rss = rss - freed; vx_rsspages_sub(mm, freed); tlb_flush_mmu(tlb, start, end); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/asm-ia64/tlb.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-ia64/tlb.h --- linux-2.6.11.9-vs2.0-rc1/include/asm-ia64/tlb.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-ia64/tlb.h 2005-05-21 16:04:15.000000000 +0200 @@ -166,7 +166,6 @@ tlb_finish_mmu (struct mmu_gather *tlb, if (rss < freed) freed = rss; - // mm->rss = rss - freed; vx_rsspages_sub(mm, freed); /* * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/asm-sparc64/tlb.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-sparc64/tlb.h --- linux-2.6.11.9-vs2.0-rc1/include/asm-sparc64/tlb.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/asm-sparc64/tlb.h 2005-05-21 16:04:27.000000000 +0200 @@ -86,7 +86,6 @@ static inline void tlb_finish_mmu(struct if (rss < freed) freed = rss; - // mm->rss = rss - freed; vx_rsspages_sub(mm, freed); tlb_flush_mmu(mp); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/linux/vs_context.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/linux/vs_context.h --- linux-2.6.11.9-vs2.0-rc1/include/linux/vs_context.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/linux/vs_context.h 2005-05-21 16:04:58.000000000 +0200 @@ -77,7 +77,6 @@ static inline void __set_vx_info(struct _file, _line); vxh_set_vx_info(vxi, vxp); - // vxo = xchg(vxp, __get_vx_info(vxi, _file, _line)); atomic_inc(&vxi->vx_usecnt); vxo = xchg(vxp, vxi); BUG_ON(vxo); @@ -101,7 +100,6 @@ static inline void __clr_vx_info(struct _file, _line); vxh_clr_vx_info(vxo, vxp); - // __put_vx_info(vxo, _file, _line); if (atomic_dec_and_test(&vxo->vx_usecnt)) free_vx_info(vxo); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/include/linux/vs_network.h linux-2.6.11.9-vs2.0-rc1-rem-com/include/linux/vs_network.h --- linux-2.6.11.9-vs2.0-rc1/include/linux/vs_network.h 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/include/linux/vs_network.h 2005-05-21 16:05:25.000000000 +0200 @@ -53,7 +53,6 @@ static inline void __set_nx_info(struct _file, _line); atomic_inc(&nxi->nx_refcnt); - // nxo = xchg(nxp, __get_nx_info(nxi, _file, _line)); nxo = xchg(nxp, nxi); BUG_ON(nxo); } @@ -77,7 +76,6 @@ static inline void __clr_nx_info(struct if (atomic_dec_and_test(&nxo->nx_refcnt)) unhash_nx_info(nxo); - // __put_nx_info(nxo, _file, _line); } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/sched.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/sched.c --- linux-2.6.11.9-vs2.0-rc1/kernel/sched.c 2005-05-15 03:52:41.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/sched.c 2005-05-21 16:06:28.000000000 +0200 @@ -806,8 +806,6 @@ void vx_hold_task(struct vx_info *vxi, // a new one on hold vx_onhold_inc(vxi); list_add_tail(&p->run_list, &rq->hold_queue); - - //printk("··· %8lu hold %p [%d]\n", jiffies, p, p->prio); } /* @@ -820,17 +818,12 @@ void vx_unhold_task(struct vx_info *vxi, list_del(&p->run_list); // one less waiting vx_onhold_dec(vxi); - // p->prio = MAX_PRIO-1; - // p->activated = 1; - // recalc_task_prio(p, now); p->state &= ~TASK_ONHOLD; enqueue_task(p, rq->expired); rq->nr_running++; if (p->static_prio < rq->best_expired_prio) rq->best_expired_prio = p->static_prio; - - // printk("··· %8lu unhold %p [%d]\n", jiffies, p, p->prio); } #else static inline @@ -2854,7 +2847,6 @@ need_resched_nonpreemptible: vxi = next->vx_info; ret = vx_tokens_recalc(vxi); - // tokens = vx_tokens_avail(next); if (ret > 0) { vx_unhold_task(vxi, next, rq); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/timer.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/timer.c --- linux-2.6.11.9-vs2.0-rc1/kernel/timer.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/timer.c 2005-05-21 16:32:23.000000000 +0200 @@ -1239,9 +1239,6 @@ asmlinkage long sys_sysinfo(struct sysin val.procs = nr_threads; } while (read_seqretry(&xtime_lock, seq)); -/* if (vx_flags(VXF_VIRT_CPU, 0)) - vx_vsi_cpu(val); -*/ si_meminfo(&val); si_swapinfo(&val); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/context.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/context.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/context.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/context.c 2005-05-21 16:12:38.000000000 +0200 @@ -59,7 +59,6 @@ static struct vx_info *__alloc_vx_info(x memset (new, 0, sizeof(struct vx_info)); new->vx_id = xid; - // INIT_RCU_HEAD(&new->vx_rcu); INIT_HLIST_NODE(&new->vx_hlist); atomic_set(&new->vx_usecnt, 0); atomic_set(&new->vx_tasks, 0); @@ -130,14 +129,11 @@ void __shutdown_vx_info(struct vx_info * void free_vx_info(struct vx_info *vxi) { - /* context shutdown is mandatory */ - // BUG_ON(vxi->vx_state != VXS_SHUTDOWN); - BUG_ON(atomic_read(&vxi->vx_usecnt)); BUG_ON(atomic_read(&vxi->vx_tasks)); BUG_ON(vx_info_state(vxi, VXS_HASHED)); - // BUG_ON(!vx_state(vxi, VXS_DEFUNCT)); + BUG_ON(!vx_state(vxi, VXS_DEFUNCT)); BUG_ON(vxi->vx_namespace); BUG_ON(vxi->vx_fs); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/legacy.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/legacy.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/legacy.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/legacy.c 2005-05-21 16:13:14.000000000 +0200 @@ -52,7 +52,6 @@ int vc_new_s_context(uint32_t ctx, void if (ret == 0) { /* We keep the same vx_id, but lower the capabilities */ current->vx_info->vx_bcaps &= (~vc_data.remove_cap); - // current->cap_bset &= (~vc_data.remove_cap); ret = vx_current_xid(); current->vx_info->vx_flags |= vc_data.flags; } @@ -92,7 +91,6 @@ int vc_new_s_context(uint32_t ctx, void ret = vx_migrate_task(current, new_vxi); if (ret == 0) { current->vx_info->vx_bcaps &= (~vc_data.remove_cap); - // current->cap_bset &= (~vc_data.remove_cap); new_vxi->vx_flags |= vc_data.flags; if (vc_data.flags & VX_INFO_INIT) vx_set_initpid(new_vxi, current->tgid); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/legacynet.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/legacynet.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/legacynet.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/legacynet.c 2005-05-21 16:13:34.000000000 +0200 @@ -74,14 +74,11 @@ int vc_set_ipv4root(uint32_t nbip, void new_nxi->mask[i] = vc_data.nx_mask_pair[i].mask; } new_nxi->v4_bcast = vc_data.broadcast; - // current->nx_info = new_nxi; if (nxi) { printk("!!! switching nx_info %p->%p\n", nxi, new_nxi); clr_nx_info(¤t->nx_info); } nx_migrate_task(current, new_nxi); - // set_nx_info(¤t->nx_info, new_nxi); - // current->nid = new_nxi->nx_id; put_nx_info(new_nxi); return 0; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/network.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/network.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/network.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/network.c 2005-05-21 16:15:35.000000000 +0200 @@ -90,9 +90,6 @@ static inline int __free_nx_info(struct void free_nx_info(struct nx_info *nxi) { - /* context shutdown is mandatory */ - // BUG_ON(nxi->nx_state != NXS_SHUTDOWN); - // BUG_ON(nxi->nx_state & NXS_HASHED); BUG_ON(__free_nx_info(nxi)); @@ -382,8 +379,6 @@ int nx_migrate_task(struct task_struct * p->nid = nxi->nx_id; task_unlock(p); - /* obsoleted by clr/set */ - // put_nx_info(old_nxi); out: put_nx_info(old_nxi); return ret; @@ -530,7 +525,6 @@ int vc_nx_info(uint32_t id, void __user int vc_net_create(uint32_t nid, void __user *data) { - // int ret = -ENOMEM; struct nx_info *new_nxi; int ret; @@ -656,7 +650,6 @@ int vc_set_nflags(uint32_t id, void __us /* special STATE flag handling */ mask = vx_mask_mask(vc_data.mask, nxi->nx_flags, IPF_ONE_TIME); trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword); - // if (trigger & IPF_STATE_SETUP) nxi->nx_flags = vx_mask_flags(nxi->nx_flags, vc_data.flagword, mask); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/proc.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/proc.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/proc.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/proc.c 2005-05-21 17:03:46.000000000 +0200 @@ -255,7 +255,6 @@ static struct inode *proc_vid_make_inode inode->i_uid = 0; inode->i_gid = 0; - // inode->i_xid = xid; out: return inode; } @@ -280,13 +279,6 @@ static int proc_vid_revalidate(struct de return 0; } -/* -static int proc_vid_delete_dentry(struct dentry * dentry) -{ - return 1; -} -*/ - #define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) @@ -325,7 +317,6 @@ static struct file_operations proc_vid_i static struct dentry_operations proc_vid_dentry_operations = { d_revalidate: proc_vid_revalidate, -// d_delete: proc_vid_delete_dentry, }; @@ -424,7 +415,6 @@ static struct dentry *proc_vid_lookup(st return ERR_PTR(-EINVAL); } inode->i_mode = p->mode; -// inode->i_op = &proc_vid_info_inode_operations; inode->i_fop = &proc_vid_info_file_operations; inode->i_nlink = 1; inode->i_flags|=S_IMMUTABLE; @@ -546,8 +536,6 @@ struct dentry *proc_virtual_lookup(struc inode->i_ino = fake_ino(1, PROC_XID_INO); inode->i_mode = S_IFLNK|S_IRWXUGO; inode->i_uid = inode->i_gid = 0; - inode->i_size = 64; -// inode->i_op = &proc_current_inode_operations; d_add(dentry, inode); return NULL; } @@ -558,8 +546,6 @@ struct dentry *proc_virtual_lookup(struc inode->i_fop = &proc_vid_info_file_operations; PROC_I(inode)->op.proc_vid_read = proc_virtual_info; inode->i_mode = S_IFREG|S_IRUGO; -// inode->i_size = 64; -// inode->i_op = &proc_current_inode_operations; d_add(dentry, inode); return NULL; } @@ -616,8 +602,6 @@ struct dentry *proc_vnet_lookup(struct i inode->i_ino = fake_ino(1, PROC_NID_INO); inode->i_mode = S_IFLNK|S_IRWXUGO; inode->i_uid = inode->i_gid = 0; - inode->i_size = 64; -// inode->i_op = &proc_current_inode_operations; d_add(dentry, inode); return NULL; } @@ -628,8 +612,6 @@ struct dentry *proc_vnet_lookup(struct i inode->i_fop = &proc_vid_info_file_operations; PROC_I(inode)->op.proc_vid_read = proc_vnet_info; inode->i_mode = S_IFREG|S_IRUGO; -// inode->i_size = 64; -// inode->i_op = &proc_current_inode_operations; d_add(dentry, inode); return NULL; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/sched.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/sched.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/sched.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/sched.c 2005-05-21 16:40:39.000000000 +0200 @@ -114,14 +114,8 @@ int vx_effective_vavavoom(struct vx_info max = max * max; vavavoom = max_prio * VAVAVOOM_RATIO / 100 * (vavavoom*vavavoom - (max >> 2)) / max; - /* alternative, geometric mapping - vavavoom = -( MAX_USER_PRIO*VAVAVOOM_RATIO/100 * vavavoom - / vxi->sched.tokens_max - - MAX_USER_PRIO*VAVAVOOM_RATIO/100/2); */ } else vavavoom = 0; - /* vavavoom = ( MAX_USER_PRIO*VAVAVOOM_RATIO/100*tokens_left(p) - - MAX_USER_PRIO*VAVAVOOM_RATIO/100/2); */ vxi->sched.vavavoom = vavavoom; return vavavoom; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/kernel/vserver/signal.c linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/signal.c --- linux-2.6.11.9-vs2.0-rc1/kernel/vserver/signal.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/kernel/vserver/signal.c 2005-05-21 16:17:24.000000000 +0200 @@ -118,7 +118,6 @@ out: int vc_wait_exit(uint32_t id, void __user *data) { -// struct vcmd_wait_exit_v0 vc_data; struct vx_info *vxi; int ret; diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/fremap.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/fremap.c --- linux-2.6.11.9-vs2.0-rc1/mm/fremap.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/fremap.c 2005-05-21 16:17:36.000000000 +0200 @@ -40,7 +40,6 @@ static inline void zap_pte(struct mm_str set_page_dirty(page); page_remove_rmap(page); page_cache_release(page); - // mm->rss--; vx_rsspages_dec(mm); } } @@ -97,7 +96,6 @@ int install_page(struct mm_struct *mm, s zap_pte(mm, vma, addr, pte); - // mm->rss++; vx_rsspages_inc(mm); flush_icache_page(vma, page); set_pte(pte, mk_pte(page, prot)); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/memory.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/memory.c --- linux-2.6.11.9-vs2.0-rc1/mm/memory.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/memory.c 2005-05-21 16:17:57.000000000 +0200 @@ -313,10 +313,8 @@ copy_one_pte(struct mm_struct *dst_mm, pte = pte_mkclean(pte); pte = pte_mkold(pte); get_page(page); - // dst_mm->rss++; vx_rsspages_inc(dst_mm); if (PageAnon(page)) - // dst_mm->anon_rss++; vx_anonpages_inc(dst_mm); set_pte(dst_pte, pte); page_dup_rmap(page); @@ -515,7 +513,6 @@ static void zap_pte_range(struct mmu_gat if (pte_dirty(pte)) set_page_dirty(page); if (PageAnon(page)) - // tlb->mm->anon_rss--; vx_anonpages_dec(tlb->mm); else if (pte_young(pte)) mark_page_accessed(page); @@ -1340,10 +1337,8 @@ static int do_wp_page(struct mm_struct * page_table = pte_offset_map(pmd, address); if (likely(pte_same(*page_table, pte))) { if (PageAnon(old_page)) - // mm->anon_rss--; vx_anonpages_dec(mm); if (PageReserved(old_page)) { - // ++mm->rss; vx_rsspages_inc(mm); acct_update_integrals(); update_mem_hiwater(); @@ -1755,7 +1750,6 @@ static int do_swap_page(struct mm_struct if (vm_swap_full()) remove_exclusive_swap_page(page); - // mm->rss++; vx_rsspages_inc(mm); acct_update_integrals(); update_mem_hiwater(); @@ -1825,7 +1819,6 @@ do_anonymous_page(struct mm_struct *mm, spin_unlock(&mm->page_table_lock); goto out; } - // mm->rss++; vx_rsspages_inc(mm); acct_update_integrals(); update_mem_hiwater(); @@ -1947,7 +1940,6 @@ retry: /* Only go through if we didn't race with anybody else... */ if (pte_none(*page_table)) { if (!PageReserved(new_page)) - // ++mm->rss; vx_rsspages_inc(mm); acct_update_integrals(); update_mem_hiwater(); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/mlock.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mlock.c --- linux-2.6.11.9-vs2.0-rc1/mm/mlock.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mlock.c 2005-05-21 16:18:13.000000000 +0200 @@ -50,7 +50,6 @@ static int mlock_fixup(struct vm_area_st ret = make_pages_present(start, end); } - // vma->vm_mm->locked_vm -= pages; vx_vmlocked_sub(vma->vm_mm, pages); out: if (ret == -ENOMEM) diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/mmap.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mmap.c --- linux-2.6.11.9-vs2.0-rc1/mm/mmap.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mmap.c 2005-05-21 16:18:31.000000000 +0200 @@ -1113,11 +1113,9 @@ munmap_back: kmem_cache_free(vm_area_cachep, vma); } out: - // mm->total_vm += len >> PAGE_SHIFT; vx_vmpages_add(mm, len >> PAGE_SHIFT); __vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); if (vm_flags & VM_LOCKED) { - // mm->locked_vm += len >> PAGE_SHIFT; vx_vmlocked_add(mm, len >> PAGE_SHIFT); make_pages_present(addr, addr + len); } @@ -1468,10 +1466,8 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Ok, everything looks good - let it rip */ - // mm->total_vm += grow; vx_vmpages_add(mm, grow); if (vma->vm_flags & VM_LOCKED) - // mm->locked_vm += grow; vx_vmlocked_add(mm, grow); __vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow); acct_update_integrals(); @@ -1674,11 +1670,9 @@ static void unmap_vma(struct mm_struct * { size_t len = area->vm_end - area->vm_start; - // area->vm_mm->total_vm -= len >> PAGE_SHIFT; vx_vmpages_sub(area->vm_mm, len >> PAGE_SHIFT); if (area->vm_flags & VM_LOCKED) - // area->vm_mm->locked_vm -= len >> PAGE_SHIFT; vx_vmlocked_sub(area->vm_mm, len >> PAGE_SHIFT); vm_stat_unaccount(area); area->vm_mm->unmap_area(area); @@ -1980,10 +1974,8 @@ unsigned long do_brk(unsigned long addr, vma->vm_page_prot = protection_map[flags & 0x0f]; vma_link(mm, vma, prev, rb_link, rb_parent); out: - // mm->total_vm += len >> PAGE_SHIFT; vx_vmpages_add(mm, len >> PAGE_SHIFT); if (flags & VM_LOCKED) { - // mm->locked_vm += len >> PAGE_SHIFT; vx_vmlocked_add(mm, len >> PAGE_SHIFT); make_pages_present(addr, addr + len); } @@ -2019,11 +2011,8 @@ void exit_mmap(struct mm_struct *mm) vma = mm->mmap; mm->mmap = mm->mmap_cache = NULL; mm->mm_rb = RB_ROOT; - // mm->rss = 0; vx_rsspages_sub(mm, mm->rss); - // mm->total_vm = 0; vx_vmpages_sub(mm, mm->total_vm); - // mm->locked_vm = 0; vx_vmlocked_sub(mm, mm->locked_vm); spin_unlock(&mm->page_table_lock); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/mremap.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mremap.c --- linux-2.6.11.9-vs2.0-rc1/mm/mremap.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/mremap.c 2005-05-21 16:18:44.000000000 +0200 @@ -247,11 +247,9 @@ static unsigned long move_vma(struct vm_ vma->vm_next->vm_flags |= VM_ACCOUNT; } - // mm->total_vm += new_len >> PAGE_SHIFT; vx_vmpages_add(mm, new_len >> PAGE_SHIFT); __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT); if (vm_flags & VM_LOCKED) { - // mm->locked_vm += new_len >> PAGE_SHIFT; vx_vmlocked_add(mm, new_len >> PAGE_SHIFT); if (new_len > old_len) make_pages_present(new_addr + old_len, @@ -396,12 +394,10 @@ unsigned long do_mremap(unsigned long ad vma_adjust(vma, vma->vm_start, addr + new_len, vma->vm_pgoff, NULL); - // current->mm->total_vm += pages; vx_vmpages_add(current->mm, pages); __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, pages); if (vma->vm_flags & VM_LOCKED) { - // current->mm->locked_vm += pages; vx_vmlocked_add(vma->vm_mm, pages); make_pages_present(addr + old_len, addr + new_len); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/nommu.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/nommu.c --- linux-2.6.11.9-vs2.0-rc1/mm/nommu.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/nommu.c 2005-05-21 16:18:58.000000000 +0200 @@ -694,7 +694,6 @@ unsigned long do_mmap_pgoff(struct file realalloc += kobjsize(vma); askedalloc += sizeof(*vma); - // current->mm->total_vm += len >> PAGE_SHIFT; vx_vmpages_add(current->mm, len >> PAGE_SHIFT); add_nommu_vma(vma); @@ -814,7 +813,6 @@ int do_munmap(struct mm_struct *mm, unsi realalloc -= kobjsize(vml); askedalloc -= sizeof(*vml); kfree(vml); - // mm->total_vm -= len >> PAGE_SHIFT; vx_vmpages_sub(mm, len >> PAGE_SHIFT); #ifdef DEBUG @@ -834,7 +832,6 @@ void exit_mmap(struct mm_struct * mm) printk("Exit_mmap:\n"); #endif - // mm->total_vm = 0; vx_vmpages_sub(mm, mm->total_vm); while ((tmp = mm->context.vmlist)) { diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/rmap.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/rmap.c --- linux-2.6.11.9-vs2.0-rc1/mm/rmap.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/rmap.c 2005-05-21 16:19:21.000000000 +0200 @@ -438,7 +438,6 @@ void page_add_anon_rmap(struct page *pag BUG_ON(PageReserved(page)); BUG_ON(!anon_vma); - // vma->vm_mm->anon_rss++; vx_anonpages_inc(vma->vm_mm); anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; @@ -598,11 +597,9 @@ static int try_to_unmap_one(struct page } set_pte(pte, swp_entry_to_pte(entry)); BUG_ON(pte_file(*pte)); - // mm->anon_rss--; vx_anonpages_dec(mm); } - // mm->rss--; vx_rsspages_dec(mm); acct_update_integrals(); page_remove_rmap(page); @@ -710,7 +707,6 @@ static void try_to_unmap_cluster(unsigne page_remove_rmap(page); page_cache_release(page); acct_update_integrals(); - // mm->rss--; vx_rsspages_dec(mm); (*mapcount)--; } diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/mm/swapfile.c linux-2.6.11.9-vs2.0-rc1-rem-com/mm/swapfile.c --- linux-2.6.11.9-vs2.0-rc1/mm/swapfile.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/mm/swapfile.c 2005-05-21 16:19:36.000000000 +0200 @@ -433,7 +433,6 @@ static void unuse_pte(struct vm_area_struct *vma, unsigned long address, pte_t *dir, swp_entry_t entry, struct page *page) { - // vma->vm_mm->rss++; vx_rsspages_inc(vma->vm_mm); get_page(page); set_pte(dir, pte_mkold(mk_pte(page, vma->vm_page_prot))); diff -NurpP --minimal linux-2.6.11.9-vs2.0-rc1/net/core/sock.c linux-2.6.11.9-vs2.0-rc1-rem-com/net/core/sock.c --- linux-2.6.11.9-vs2.0-rc1/net/core/sock.c 2005-05-15 03:52:42.000000000 +0200 +++ linux-2.6.11.9-vs2.0-rc1-rem-com/net/core/sock.c 2005-05-21 16:19:59.000000000 +0200 @@ -671,10 +671,8 @@ void sk_free(struct sock *sk) security_sk_free(sk); vx_sock_dec(sk); - // BUG_ON(sk->sk_vx_info); clr_vx_info(&sk->sk_vx_info); sk->sk_xid = -1; - // BUG_ON(sk->sk_nx_info); clr_nx_info(&sk->sk_nx_info); sk->sk_nid = -1; kmem_cache_free(sk->sk_slab, sk);