diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-12-10 18:24:51 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:54:13 -0800 |
| commit | 29a4f01daa11254debe7aba980681bb838dfff1b (patch) | |
| tree | 053b56d62c469ab3b7104381135507c36a886b4b /kernel/sys.c | |
| parent | 586278d78bfa926d7a705da2f192325b3469919d (diff) | |
mm: private anonymous memory build fixes for 4.4
Update vma_merge() call in private anonymous memory prctl,
introduced in AOSP commit ee8c5f78f09a
"mm: add a field to store names for private anonymous memory",
so as to align with changes from upstream commit 19a809afe2fe
"userfaultfd: teach vma_merge to merge across vma->vm_userfaultfd_ctx".
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index d0cb632eef8b..11333311cf1c 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2092,7 +2092,7 @@ static int prctl_update_vma_anon_name(struct vm_area_struct *vma, pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT); *prev = vma_merge(mm, *prev, start, end, vma->vm_flags, vma->anon_vma, vma->vm_file, pgoff, vma_policy(vma), - name_addr); + vma->vm_userfaultfd_ctx, name_addr); if (*prev) { vma = *prev; goto success; |