Remove now obsolete vm counters Signed-off-by: Christoph Lameter Index: linux-2.6.15-rc3/mm/slab.c =================================================================== --- linux-2.6.15-rc3.orig/mm/slab.c 2005-11-30 14:13:49.000000000 -0800 +++ linux-2.6.15-rc3/mm/slab.c 2005-11-30 14:13:51.000000000 -0800 @@ -1229,8 +1229,6 @@ static void *kmem_getpages(kmem_cache_t i = (1 << cachep->gfporder); if (cachep->flags & SLAB_RECLAIM_ACCOUNT) atomic_add(i, &slab_reclaim_pages); - add_page_state(nr_slab, i); - SetPageSlab(page); return addr; } @@ -1243,13 +1241,11 @@ static void kmem_freepages(kmem_cache_t { unsigned long i = (1<gfporder); struct page *page = virt_to_page(addr); - const unsigned long nr_freed = i; if (!TestClearPageSlab(page)) BUG(); - sub_page_state(nr_slab, nr_freed); if (current->reclaim_state) - current->reclaim_state->reclaimed_slab += nr_freed; + current->reclaim_state->reclaimed_slab += i; free_pages((unsigned long)addr, cachep->gfporder); if (cachep->flags & SLAB_RECLAIM_ACCOUNT) atomic_sub(1<gfporder, &slab_reclaim_pages); Index: linux-2.6.15-rc3/mm/memory.c =================================================================== --- linux-2.6.15-rc3.orig/mm/memory.c 2005-11-28 19:51:27.000000000 -0800 +++ linux-2.6.15-rc3/mm/memory.c 2005-11-30 14:13:51.000000000 -0800 @@ -116,7 +116,6 @@ static void free_pte_range(struct mmu_ga pmd_clear(pmd); pte_lock_deinit(page); pte_free_tlb(tlb, page); - dec_page_state(nr_page_table_pages); tlb->mm->nr_ptes--; } @@ -302,7 +301,6 @@ int __pte_alloc(struct mm_struct *mm, pm pte_free(new); } else { mm->nr_ptes++; - inc_page_state(nr_page_table_pages); pmd_populate(mm, pmd, new); } spin_unlock(&mm->page_table_lock); Index: linux-2.6.15-rc3/arch/arm/mm/mm-armv.c =================================================================== --- linux-2.6.15-rc3.orig/arch/arm/mm/mm-armv.c 2005-11-28 19:51:27.000000000 -0800 +++ linux-2.6.15-rc3/arch/arm/mm/mm-armv.c 2005-11-30 14:13:51.000000000 -0800 @@ -228,7 +228,6 @@ void free_pgd_slow(pgd_t *pgd) pte = pmd_page(*pmd); pmd_clear(pmd); - dec_page_state(nr_page_table_pages); pte_lock_deinit(pte); pte_free(pte); pmd_free(pmd);