From: Liam R. Howlett Date: Wed, 25 Nov 2020 01:23:17 +0000 (-0500) Subject: mmap: mmap_region() whitespace fix X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d778f75aa7ce94722e9e56ef1ac77bac3a4fb7f1;p=users%2Fjedix%2Flinux-maple.git mmap: mmap_region() whitespace fix Signed-off-by: Liam R. Howlett --- diff --git a/mm/mmap.c b/mm/mmap.c index ee04a533bb91..e20403ad4aed 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2618,7 +2618,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, /* Check next */ next = mas_next(&mas, ULONG_MAX); if (next && next->vm_start == end && vma_policy(next) && - can_vma_merge_before(next, vm_flags, NULL, file, pgoff+pglen, + can_vma_merge_before(next, vm_flags, NULL, file, pgoff + pglen, NULL_VM_UFFD_CTX)) { merge_end = next->vm_end; vma = next;