From ea253a055d4d25425c814db04b2fc86337ac7838 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 28 Dec 2021 14:21:33 -0800 Subject: [PATCH] Revert "ANDROID: mm: fix up new call to vma_merge()" This reverts commit 7df9282d8ecb5308401613deb5cfbe77beab9d6f. Replacing out-of-tree implementation with the upstream one. Bug: 120441514 Signed-off-by: Suren Baghdasaryan Change-Id: Iefc8aeeea89d89b4960d51da8625cf5d48b5e98f --- mm/mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index fe20804055a3..6c16afe7c01f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1890,8 +1890,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, */ if (unlikely(vm_flags != vma->vm_flags && prev)) { merge = vma_merge(mm, prev, vma->vm_start, vma->vm_end, vma->vm_flags, - NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX, - vma_get_anon_name(vma)); + NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX); if (merge) { /* ->mmap() can change vma->vm_file and fput the original file. So * fput the vma->vm_file here or we would add an extra fput for file