diff options
| author | Bharat Nihalani <bnihalani@nvidia.com> | 2013-12-30 20:30:28 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-12-30 20:30:28 +0530 |
| commit | 546f63c2a5ecbf08064d9a65b799906832dbe2e6 (patch) | |
| tree | b4e9b8eb333935f83109fac0426ec3dfac21c85a /mm/mprotect.c | |
| parent | b9695b63896bea96cf2ad192673429eac7f9f467 (diff) | |
| parent | c5149b1e38ecd5c3f3d3add7fc118fb47b719929 (diff) | |
Merge branch 'remotes/android/android-3.10' into dev-kernel-3.10
Change-Id: I0c919e55654e0c224a5f8a5df80d9f49e92dbb37
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index d4d5399c7aba..ea4a0f32f8e1 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -276,7 +276,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; |