From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Tue, 1 Dec 2020 02:30:04 +0000 (-0500)
Subject: mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap()
X-Git-Tag: howlett/maple_spf/20210129~45
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6ef3ece049879a6d15093b8246b50f29ba5e6e38;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap()

do_brk_munmap() already has aligned addresses.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index e9816378d33b..9770bb1ffb12 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3033,12 +3033,13 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 	struct mm_struct *mm = vma->vm_mm;
 	struct vm_area_struct unmap;
 	unsigned long unmap_pages;
-	int ret = 1;
+	int ret;
 
 	arch_unmap(mm, newbrk, oldbrk);
 
 	if (likely(vma->vm_start >= newbrk)) { // remove entire mapping(s)
-		ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true);
+		ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf,
+					  true);
 		goto munmap_full_vma;
 	}