From cfad673cfe8da2521fe1b93c6ae6bca668e05417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Thu, 6 Apr 2023 16:07:22 +0100 Subject: [PATCH] ANDROID: Revert "vma_merge: set vma iterator to correct position." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 18b098af2890cdeab07368405409111197f190d2. We want to revert 0503ea8f5ba7, and reverting this commit here will allow us doing so without conflicts. Test: build & boot, TH Bug: 277214742 Change-Id: I20f3b3d897aa96da8ac24dc78253ae75deb70353 Signed-off-by: André Draszik --- mm/mmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 66ce8b5606c13..f4f13a981b6c6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -932,7 +932,6 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, && can_vma_merge_after(prev, vm_flags, anon_vma, file, pgoff, vm_userfaultfd_ctx, anon_name)) { merge_prev = true; - vma_prev(vmi); } } /* Can we merge the successor? */ @@ -1024,6 +1023,9 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, validate_mm(mm); khugepaged_enter_vma(res, vm_flags); + if (res) + vma_iter_set(vmi, end); + return res; }