Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android...

[firefly-linux-kernel-4.4.55.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 94722a4d6b438311de1d1690d81a0d598a907339..94d50b7a6dad262fc7ffda63957d7bb304db811b 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -271,7 +271,8 @@ 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->anon_vma, vma->vm_file, pgoff, vma_policy(vma),
+                       vma_get_anon_name(vma));
        if (*pprev) {
                vma = *pprev;
                goto success;