From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail191.messagelabs.com (mail191.messagelabs.com [216.82.242.19]) by kanga.kvack.org (Postfix) with SMTP id D67A86B009D for ; Tue, 9 Mar 2010 14:44:24 -0500 (EST) Message-Id: <20100309194316.182559147@redhat.com> Date: Tue, 09 Mar 2010 20:39:29 +0100 From: aarcange@redhat.com Subject: [patch 28/35] adapt to mm_counter in -mm References: <20100309193901.207868642@redhat.com> Content-Disposition: inline; filename=mm-rss Sender: owner-linux-mm@kvack.org To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: Marcelo Tosatti , Adam Litke , Avi Kivity , Izik Eidus , Hugh Dickins , Nick Piggin , Rik van Riel , Mel Gorman , Dave Hansen , Benjamin Herrenschmidt , Ingo Molnar , Mike Travis , KAMEZAWA Hiroyuki , Christoph Lameter , Chris Wright , bpicco@redhat.com, KOSAKI Motohiro , Balbir Singh , Arnd Bergmann , "Michael S. Tsirkin" , Peter Zijlstra , Andrea Arcangeli List-ID: From: Andrea Arcangeli The interface changed slightly. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -251,7 +251,7 @@ static int __do_huge_pmd_anonymous_page( page_add_new_anon_rmap(page, vma, haddr); set_pmd_at(mm, haddr, pmd, entry); prepare_pmd_huge_pte(pgtable, mm); - add_mm_counter(mm, anon_rss, HPAGE_PMD_NR); + add_mm_counter(mm, MM_ANONPAGES, HPAGE_PMD_NR); spin_unlock(&mm->page_table_lock); } @@ -321,7 +321,7 @@ int copy_huge_pmd(struct mm_struct *dst_ VM_BUG_ON(!PageHead(src_page)); get_page(src_page); page_dup_rmap(src_page); - add_mm_counter(dst_mm, anon_rss, HPAGE_PMD_NR); + add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR); pmdp_set_wrprotect(src_mm, addr, src_pmd); pmd = pmd_mkold(pmd_wrprotect(pmd)); @@ -562,7 +562,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, pmd_clear(pmd); page_remove_rmap(page); VM_BUG_ON(page_mapcount(page) < 0); - add_mm_counter(tlb->mm, anon_rss, -HPAGE_PMD_NR); + add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR); spin_unlock(&tlb->mm->page_table_lock); VM_BUG_ON(!PageHead(page)); tlb_remove_page(tlb, page); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org