From 722e2ee09b8dfc2ac5eedb802dc0d227702df084 Mon Sep 17 00:00:00 2001 From: Stephen Wilson Date: Tue, 24 May 2011 17:12:44 -0700 Subject: mm: make gather_stats() type-safe and remove forward declaration Improve the prototype of gather_stats() to take a struct numa_maps as argument instead of a generic void *. Update all callers to make the required type explicit. Since gather_stats() is not needed before its definition and is scheduled to be moved out of mempolicy.c the declaration is removed as well. Signed-off-by: Stephen Wilson Reviewed-by: KOSAKI Motohiro Cc: Hugh Dickins Cc: David Rientjes Cc: Lee Schermerhorn Cc: Alexey Dobriyan Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/mempolicy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mm/mempolicy.c') diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 4e188766fd42..6c5306544df0 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -456,7 +456,6 @@ static const struct mempolicy_operations mpol_ops[MPOL_MAX] = { }, }; -static void gather_stats(struct page *, void *, int pte_dirty); static void migrate_page_add(struct page *page, struct list_head *pagelist, unsigned long flags); @@ -2539,9 +2538,8 @@ struct numa_maps { unsigned long node[MAX_NUMNODES]; }; -static void gather_stats(struct page *page, void *private, int pte_dirty) +static void gather_stats(struct page *page, struct numa_maps *md, int pte_dirty) { - struct numa_maps *md = private; int count = page_mapcount(page); md->pages++; @@ -2634,6 +2632,7 @@ static void check_huge_range(struct vm_area_struct *vma, static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask, unsigned long addr, unsigned long end, struct mm_walk *walk) { + struct numa_maps *md; struct page *page; if (pte_none(*pte)) @@ -2643,7 +2642,8 @@ static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask, if (!page) return 0; - gather_stats(page, walk->private, pte_dirty(*pte)); + md = walk->private; + gather_stats(page, md, pte_dirty(*pte)); return 0; } -- cgit v1.2.3-59-g8ed1b