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 0095f7a..4ccf5f0 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2092,7 +2092,7 @@
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;