From: Hugh Dickins Date: Sun, 30 Oct 2005 01:16:14 +0000 (-0700) Subject: [PATCH] mm: zap_pte_range dec rss X-Git-Tag: v2.6.15-rc1~730^2^2~52 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86d912f41dca32eca8827f2f878139735e69dc28;p=linux-2.6-omap-h63xx.git [PATCH] mm: zap_pte_range dec rss Small adjustment: zap_pte_range decrement its rss counts from 0 then finally add, avoiding negations - we don't have or need a sub_mm_rss. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/memory.c b/mm/memory.c index 7893eb4bb8c..bc6296398f8 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -609,13 +609,13 @@ static void zap_pte_range(struct mmu_gather *tlb, set_pte_at(mm, addr, pte, pgoff_to_pte(page->index)); if (PageAnon(page)) - anon_rss++; + anon_rss--; else { if (pte_dirty(ptent)) set_page_dirty(page); if (pte_young(ptent)) mark_page_accessed(page); - file_rss++; + file_rss--; } page_remove_rmap(page); tlb_remove_page(tlb, page); @@ -632,7 +632,7 @@ static void zap_pte_range(struct mmu_gather *tlb, pte_clear_full(mm, addr, pte, tlb->fullmm); } while (pte++, addr += PAGE_SIZE, addr != end); - add_mm_rss(mm, -file_rss, -anon_rss); + add_mm_rss(mm, file_rss, anon_rss); pte_unmap(pte - 1); }