pagewalk: remove argument hmask from hugetlb_entry()

hugetlb_entry() doesn't use the argument hmask any more, so let's remove
it now.

Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Cliff Wickman <cpw@sgi.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 933e2469733eac07a2b73c7fda6cf7c3758fd7ee..1e84ed4e4b74182fb942f5287a03268646d0df78 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1023,15 +1023,15 @@ 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(pte_t *pte, unsigned long hmask,
-                                unsigned long addr, unsigned long end,
-                                struct mm_walk *walk)
+static int pagemap_hugetlb(pte_t *pte, unsigned long addr, unsigned long end,
+                          struct mm_walk *walk)
 {
        struct pagemapread *pm = walk->private;
        struct vm_area_struct *vma = walk->vma;
        int err = 0;
        int flags2;
        pagemap_entry_t pme;
+       unsigned long hmask;
 
        WARN_ON_ONCE(!vma);
 
@@ -1293,8 +1293,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;
@@ -1312,8 +1312,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 a/include/linux/mm.h b/include/linux/mm.h
index d0e96c98cc672cb909fc0a4275d768040ad49f5a..a8b2be66f76ea2d45a977045fd87fe5b9ea197e6 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1122,9 +1122,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 a/mm/pagewalk.c b/mm/pagewalk.c
index 81c1228ce67d4267582d7dd0ca4fca0f0ac01ae6..a834f4deb527e809b1dba00801c5adedf88196e2 100644 (file)
--- a/mm/pagewalk.c
+++ b/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;