From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by kanga.kvack.org (Postfix) with ESMTP id C076D6B004D for ; Mon, 14 Oct 2013 13:37:46 -0400 (EDT) Received: by mail-pb0-f54.google.com with SMTP id ro12so7631091pbb.27 for ; Mon, 14 Oct 2013 10:37:46 -0700 (PDT) From: Naoya Horiguchi Subject: [PATCH 10/11] pagewalk: remove argument hmask from hugetlb_entry() Date: Mon, 14 Oct 2013 13:37:09 -0400 Message-Id: <1381772230-26878-11-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1381772230-26878-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1381772230-26878-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: owner-linux-mm@kvack.org List-ID: 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 , linux-kernel@vger.kernel.org All of callbacks connected to hugetlb_entry() are changed not to use the argument hmask. So we can 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.12-rc4.orig/fs/proc/task_mmu.c v3.12-rc4/fs/proc/task_mmu.c index e3e03bc..aefe239 100644 --- v3.12-rc4.orig/fs/proc/task_mmu.c +++ v3.12-rc4/fs/proc/task_mmu.c @@ -1025,8 +1025,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; @@ -1034,6 +1033,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); @@ -1297,8 +1297,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; @@ -1316,8 +1316,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.12-rc4.orig/include/linux/mm.h v3.12-rc4/include/linux/mm.h index 6c138d7..04cf32c 100644 --- v3.12-rc4.orig/include/linux/mm.h +++ v3.12-rc4/include/linux/mm.h @@ -966,9 +966,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.12-rc4.orig/mm/pagewalk.c v3.12-rc4/mm/pagewalk.c index 80b247b..9437ffc 100644 --- v3.12-rc4.orig/mm/pagewalk.c +++ v3.12-rc4/mm/pagewalk.c @@ -182,7 +182,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); if (err) break; } while (addr = next, addr != end); -- 1.8.3.1 -- 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