mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes

The maple tree iterator clean up is incompatible with the way
do_vmi_align_munmap() expects it to behave.  Update the expected
behaviour to map now since the change will work currently.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index c374ff80eb693f73657b1c9abdb9ef2918f92142..36fb185e91b761cdd19f93766198b7c63997e13b 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2429,6 +2429,8 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 #endif
        }
 
+       if (mas->last >= end)
+               next = mas_walk(mas);
        if (!next)
                next = mas_next(mas, ULONG_MAX);