From: Liam R. Howlett Date: Tue, 9 Feb 2021 14:45:09 +0000 (-0500) Subject: mm/mmap: do_brk_munmap() whitespace fix X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=681e79a0144df2ae5ae9a9c0b401791c0a42e612;p=users%2Fjedix%2Flinux-maple.git mm/mmap: do_brk_munmap() whitespace fix Signed-off-by: Liam R. Howlett --- diff --git a/mm/mmap.c b/mm/mmap.c index a630696a19fbd..bebce12197b7f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2927,7 +2927,6 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, arch_unmap(mm, newbrk, oldbrk); - if (likely((vma->vm_end < oldbrk) || ((vma->vm_start == newbrk) && (vma->vm_end == oldbrk)))) { // remove entire mapping(s) @@ -2943,6 +2942,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, unmap.vm_pgoff = newbrk >> PAGE_SHIFT; if (vma->anon_vma) vma_set_anonymous(&unmap); + ret = userfaultfd_unmap_prep(&unmap, newbrk, oldbrk, uf); if (ret) return ret;