mm: private anonymous memory build fixes for 4.4

Update vma_merge() call in private anonymous memory prctl,
introduced in AOSP commit ee8c5f78f09a
"mm: add a field to store names for private anonymous memory",
so as to align with changes from upstream commit 19a809afe2fe
"userfaultfd: teach vma_merge to merge across vma->vm_userfaultfd_ctx".

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --git a/kernel/sys.c b/kernel/sys.c
index d0cb632eef8b85c585f8475db8e2a8a83a4c32d0..11333311cf1c5da8aab5c1eaceaaaee671468676 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2092,7 +2092,7 @@ static int prctl_update_vma_anon_name(struct vm_area_struct *vma,
        pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);
        *prev = vma_merge(mm, *prev, start, end, vma->vm_flags, vma->anon_vma,
                                vma->vm_file, pgoff, vma_policy(vma),
-                               name_addr);
+                               vma->vm_userfaultfd_ctx, name_addr);
        if (*prev) {
                vma = *prev;
                goto success;