Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753184AbaBJVpn (ORCPT ); Mon, 10 Feb 2014 16:45:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62374 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbaBJVpe (ORCPT ); Mon, 10 Feb 2014 16:45:34 -0500 From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , Matt Mackall , Cliff Wickman , KOSAKI Motohiro , Johannes Weiner , KAMEZAWA Hiroyuki , Michal Hocko , "Aneesh Kumar K.V" , Pavel Emelyanov , Rik van Riel , kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] pagewalk: remove argument hmask from hugetlb_entry() Date: Mon, 10 Feb 2014 16:44:35 -0500 Message-Id: <1392068676-30627-11-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1392068676-30627-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1392068676-30627-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org hugetlb_entry() doesn't use the argument hmask any more, so let's remove it now. Signed-off-by: Naoya Horiguchi --- fs/proc/task_mmu.c | 12 ++++++------ include/linux/mm.h | 5 ++--- mm/pagewalk.c | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git v3.14-rc2.orig/fs/proc/task_mmu.c v3.14-rc2/fs/proc/task_mmu.c index 8b23bbcc5e04..f819d0d4a0e8 100644 --- v3.14-rc2.orig/fs/proc/task_mmu.c +++ v3.14-rc2/fs/proc/task_mmu.c @@ -1022,8 +1022,7 @@ static void huge_pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread * } /* This function walks within one hugetlb entry in the single call */ -static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long end, +static int pagemap_hugetlb(pte_t *pte, unsigned long addr, unsigned long end, struct mm_walk *walk) { struct pagemapread *pm = walk->private; @@ -1031,6 +1030,7 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask, int err = 0; int flags2; pagemap_entry_t pme; + unsigned long hmask; WARN_ON_ONCE(!vma); @@ -1292,8 +1292,8 @@ static int gather_pmd_stats(pmd_t *pmd, unsigned long addr, return 0; } #ifdef CONFIG_HUGETLB_PAGE -static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long end, struct mm_walk *walk) +static int gather_hugetlb_stats(pte_t *pte, unsigned long addr, + unsigned long end, struct mm_walk *walk) { struct numa_maps *md; struct page *page; @@ -1311,8 +1311,8 @@ static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, } #else -static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long end, struct mm_walk *walk) +static int gather_hugetlb_stats(pte_t *pte, unsigned long addr, + unsigned long end, struct mm_walk *walk) { return 0; } diff --git v3.14-rc2.orig/include/linux/mm.h v3.14-rc2/include/linux/mm.h index 144b08617957..7b6b596a5bf1 100644 --- v3.14-rc2.orig/include/linux/mm.h +++ v3.14-rc2/include/linux/mm.h @@ -1091,9 +1091,8 @@ struct mm_walk { unsigned long next, struct mm_walk *walk); int (*pte_hole)(unsigned long addr, unsigned long next, struct mm_walk *walk); - int (*hugetlb_entry)(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long next, - struct mm_walk *walk); + int (*hugetlb_entry)(pte_t *pte, unsigned long addr, + unsigned long next, struct mm_walk *walk); int (*test_walk)(unsigned long addr, unsigned long next, struct mm_walk *walk); struct mm_struct *mm; diff --git v3.14-rc2.orig/mm/pagewalk.c v3.14-rc2/mm/pagewalk.c index 2a88dfa58af6..416e981243b1 100644 --- v3.14-rc2.orig/mm/pagewalk.c +++ v3.14-rc2/mm/pagewalk.c @@ -199,7 +199,7 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end, * in walk->hugetlb_entry(). */ if (pte && walk->hugetlb_entry) - err = walk->hugetlb_entry(pte, hmask, addr, next, walk); + err = walk->hugetlb_entry(pte, addr, next, walk); spin_unlock(ptl); if (err) break; -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/