From 7df9282d8ecb5308401613deb5cfbe77beab9d6f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 8 Aug 2020 13:48:59 +0200 Subject: [PATCH] ANDROID: mm: fix up new call to vma_merge() commit 60500a42286d ("ANDROID: mm: add a field to store names for private anonymous memory") changed the parameters to vma_merge() which causes any new use of that function upstream to break the build. So fix up the new call by adding the needed extra parameter. Maybe someday this patch could be dropped to prevent this. Bug: 120441514 Cc: Colin Cross Cc: Dmitry Shmidt Cc: Amit Pundir Signed-off-by: Greg Kroah-Hartman Change-Id: I05629d408449124215ef9181223a686f4855cbf6 --- mm/mmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2260a9ad9f78..c3f17081d114 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1788,7 +1788,8 @@ 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); + NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX, + vma_get_anon_name(vma)); if (merge) { fput(file); vm_area_free(vma);