mm/mmap: Fix accounting in count_vma_pages_range again

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/mm/mmap.c b/mm/mmap.c
index 0a12446b25ad245e37e8de17bfb4dbb5620b7f06..5d6a1e3f1cc7ae075b40285c2014e069d0bffd88 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -541,8 +541,8 @@ static unsigned long count_vma_pages_range(struct mm_struct *mm,
        nr_pages = (min(end, vm_end) - max(addr, vm_start)) >> PAGE_SHIFT;
 
        /* Iterate over the rest of the overlaps */
-       mas.start = mas.end = vm_end;
-       mas_for_each(mas, vma, end) {
+       mas.index = mas.last = vm_end;
+       mas_for_each(&mas, vma, end) {
                vm_start = vma->vm_start;
                vm_end = vma->vm_end;
                nr_pages += (min(end, vm_end) - vm_start) >> PAGE_SHIFT;