mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap()
authorLiam R. Howlett <Liam.Howlett@Oracle.com>
Tue, 1 Dec 2020 02:30:04 +0000 (21:30 -0500)
committerLiam R. Howlett <Liam.Howlett@Oracle.com>
Wed, 20 Jan 2021 14:28:15 +0000 (09:28 -0500)
do_brk_munmap() already has aligned addresses.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
mm/mmap.c

index ad7bb333fe36c75732249fce267587faff51dade..0fb9b16fe745aa53cb43c6508e952b4c4e92f70a 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3024,12 +3024,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;
        }