ANDROID: Revert "vma_merge: set vma iterator to correct position."

This reverts commit 18b098a. We want to revert 0503ea8, 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 <[email protected]>
ammarfaizi2 · Apr 6, 2023 · cfad673 · cfad673
1 parent 78ffde1
commit cfad673
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;
 }