From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 14 Apr 2022 19:16:46 +0000 (-0700)
Subject: mm-khugepaged-introduce-khugepaged_enter_vma-helper-vs-maple-tree
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=11e3bb6794efc96b2d0e3ec5d72a1ee205bd5c2c;p=users%2Fjedix%2Flinux-maple.git

mm-khugepaged-introduce-khugepaged_enter_vma-helper-vs-maple-tree

Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index c335a34b58d8..e3695eb34ad4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2580,7 +2580,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	/* Actually expand, if possible */
 	if (vma &&
 	    !vma_expand(&mas, vma, merge_start, merge_end, vm_pgoff, next)) {
-		khugepaged_enter_vma_merge(vma, vm_flags);
+		khugepaged_enter_vma(vma, vm_flags);
 		goto expanded;
 	}
 
@@ -2995,7 +2995,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
 			anon_vma_interval_tree_post_update_vma(vma);
 			anon_vma_unlock_write(vma->anon_vma);
 		}
-		khugepaged_enter_vma_merge(vma, flags);
+		khugepaged_enter_vma(vma, flags);
 		goto out;
 	}