diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
| commit | 76e8de404a34bfff318da0b31e752db2642511f3 (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /mm/mprotect.c | |
| parent | e9b3bd248b349433215cf01064a866b632fb3f4b (diff) | |
| parent | 354d86f4daecdc3553830e553f6fc17add736234 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultzv3.10/topic/android-fixes
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 94722a4d6b4..94d50b7a6da 100644 --- 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; |