diff options
-rw-r--r-- | mm/mempolicy.c | 8 |
1 files changed, 4 insertions, 4 deletions
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] = { | |||
456 | }, | 456 | }, |
457 | }; | 457 | }; |
458 | 458 | ||
459 | static void gather_stats(struct page *, void *, int pte_dirty); | ||
460 | static void migrate_page_add(struct page *page, struct list_head *pagelist, | 459 | static void migrate_page_add(struct page *page, struct list_head *pagelist, |
461 | unsigned long flags); | 460 | unsigned long flags); |
462 | 461 | ||
@@ -2539,9 +2538,8 @@ struct numa_maps { | |||
2539 | unsigned long node[MAX_NUMNODES]; | 2538 | unsigned long node[MAX_NUMNODES]; |
2540 | }; | 2539 | }; |
2541 | 2540 | ||
2542 | static void gather_stats(struct page *page, void *private, int pte_dirty) | 2541 | static void gather_stats(struct page *page, struct numa_maps *md, int pte_dirty) |
2543 | { | 2542 | { |
2544 | struct numa_maps *md = private; | ||
2545 | int count = page_mapcount(page); | 2543 | int count = page_mapcount(page); |
2546 | 2544 | ||
2547 | md->pages++; | 2545 | md->pages++; |
@@ -2634,6 +2632,7 @@ static void check_huge_range(struct vm_area_struct *vma, | |||
2634 | static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask, | 2632 | static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask, |
2635 | unsigned long addr, unsigned long end, struct mm_walk *walk) | 2633 | unsigned long addr, unsigned long end, struct mm_walk *walk) |
2636 | { | 2634 | { |
2635 | struct numa_maps *md; | ||
2637 | struct page *page; | 2636 | struct page *page; |
2638 | 2637 | ||
2639 | if (pte_none(*pte)) | 2638 | if (pte_none(*pte)) |
@@ -2643,7 +2642,8 @@ static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask, | |||
2643 | if (!page) | 2642 | if (!page) |
2644 | return 0; | 2643 | return 0; |
2645 | 2644 | ||
2646 | gather_stats(page, walk->private, pte_dirty(*pte)); | 2645 | md = walk->private; |
2646 | gather_stats(page, md, pte_dirty(*pte)); | ||
2647 | return 0; | 2647 | return 0; |
2648 | } | 2648 | } |
2649 | 2649 | ||