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 06b884ac475f528e6095b9346676ec5c23c6faa1..edbc9fded35efe59449aa98fe5fd2d57b3cd1bdd 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;