diff --git a/mm/mmap.c b/mm/mmap.c
index 5ff6be2faac4..91e5f2aacca5 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2394,6 +2394,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);