Merge 4.4.81 into android-4.4

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index c0b4b2a4946284bc98b4e953c7b69b2a0cde4933..b8849a3930a08ddc672f3e5e284c004d47e16c75 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -294,7 +294,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
        pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);
        *pprev = vma_merge(mm, *pprev, 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 (*pprev) {
                vma = *pprev;
                goto success;