diff --git a/[refs] b/[refs] index b10c651f5000..3b880df080a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c10376271e097fa13cda956e1b2f3cb7e4d4dd9 +refs/heads/master: 86d912f41dca32eca8827f2f878139735e69dc28 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 7893eb4bb8c0..bc6296398f8b 100644 --- a/trunk/mm/memory.c +++ b/trunk/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); }