github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: mm: fix up new call to vma_merge()

Browse Source 
commit 60500a4228 ("ANDROID: mm: add a field to store names for
private anonymous memory") changed the parameters to vma_merge() which
causes any new use of that function upstream to break the build.

So fix up the new call by adding the needed extra parameter.

Maybe someday this patch could be dropped to prevent this.

Bug: 120441514
Cc: Colin Cross <ccross@android.com>
Cc: Dmitry Shmidt <dimitrysh@google.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I05629d408449124215ef9181223a686f4855cbf6
This commit is contained in:
Greg Kroah-Hartman 2020-08-08 13:48:59 +02:00
parent 7db49ba685
commit 7df9282d8e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mm/mmap.c
View File

@ -1788,7 +1788,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
*/
if (unlikely(vm_flags != vma->vm_flags && prev)) {
merge = vma_merge(mm, prev, vma->vm_start, vma->vm_end, vma->vm_flags,
NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX);
NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX,
vma_get_anon_name(vma));
if (merge) {
fput(file);
vm_area_free(vma);