From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 11 Sep 2020 01:52:56 +0000 (-0400)
Subject: mm/mmap: Fix accounting in count_vma_pages_range again
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2e841d14c7dd8f3f42b845dc258f10923406cef3;p=users%2Fjedix%2Flinux-maple.git

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 06b884ac475f5..edbc9fded35ef 100644
--- 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;