From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755044Ab3ELBV6 (ORCPT ); Sat, 11 May 2013 21:21:58 -0400 Received: from mga03.intel.com ([143.182.124.21]:3497 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754660Ab3ELBVj (ORCPT ); Sat, 11 May 2013 21:21:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,654,1363158000"; d="scan'208";a="301080872" From: "Kirill A. Shutemov" To: Andrea Arcangeli , Andrew Morton Cc: Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , Hillf Danton , Dave Hansen , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv4 28/39] thp: prepare zap_huge_pmd() to uncharge file pages Date: Sun, 12 May 2013 04:23:25 +0300 Message-Id: <1368321816-17719-29-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368321816-17719-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1368321816-17719-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Kirill A. Shutemov" Uncharge pages from correct counter. Signed-off-by: Kirill A. Shutemov --- mm/huge_memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 7ad458d..a88f9b2 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1385,10 +1385,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, spin_unlock(&tlb->mm->page_table_lock); put_huge_zero_page(); } else { + int member; page = pmd_page(orig_pmd); page_remove_rmap(page); VM_BUG_ON(page_mapcount(page) < 0); - add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR); + member = PageAnon(page) ? MM_ANONPAGES : MM_FILEPAGES; + add_mm_counter(tlb->mm, member, -HPAGE_PMD_NR); VM_BUG_ON(!PageHead(page)); tlb->mm->nr_ptes--; spin_unlock(&tlb->mm->page_table_lock); -- 1.7.10.4