Merge 4.14.95 into android-4.14-p

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 46af369c13e5de4928c912fec2b5fd6aa87b48d2..658ad5562dcaf5c3a632e49b4975f50753500937 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -528,7 +528,7 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
        pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);
        *prev = vma_merge(mm, *prev, start, end, newflags, vma->anon_vma,
                          vma->vm_file, pgoff, vma_policy(vma),
-                         vma->vm_userfaultfd_ctx);
+                         vma->vm_userfaultfd_ctx, vma_get_anon_name(vma));
        if (*prev) {
                vma = *prev;
                goto success;