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 5878c7d06088f2068194c9847a4314628f15f5a3..25e3cf0327ff5156365228c027a7a2c3115547d0 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2991,15 +2991,12 @@ 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)
-               mas_set(mas, newbrk);
-               if (vma->vm_start != newbrk)
-                       mas_reset(mas); // cause a re-walk for the first overlap.
-               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;
        }