Merge tag 'v3.10.68' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index 7055883e6e250f2914ed5c0a7814400e4945c9d1..85d1a5427c27faeff4f4d8d3b52cba058685022f 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -102,7 +102,8 @@ static long madvise_behavior(struct vm_area_struct * vma,
 
        pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);
        *prev = vma_merge(mm, *prev, start, end, new_flags, vma->anon_vma,
-                               vma->vm_file, pgoff, vma_policy(vma));
+                               vma->vm_file, pgoff, vma_policy(vma),
+                               vma_get_anon_name(vma));
        if (*prev) {
                vma = *prev;
                goto success;