mm-make-vma_merge-and-split_vma-internal.patch removed from -mm tree
The quilt patch titled
Subject: mm: make vma_merge() and split_vma() internal
has been removed from the -mm tree. Its filename was
mm-make-vma_merge-and-split_vma-internal.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm: make vma_merge() and split_vma() internal
Date: Wed, 11 Oct 2023 18:04:29 +0100
Now the common pattern of - attempting a merge via vma_merge() and should this fail splitting VMAs via split_vma() - has been abstracted, the former can be placed into mm/internal.h and the latter made static.
In addition, the split_vma() nommu variant also need not be exported.
---
include/linux/mm.h | 9 --------- mm/internal.h | 9 +++++++++ mm/mmap.c | 8 ++++---- mm/nommu.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-make-vma_merge-and-split_vma-internal +0 -9
@@ -3235,16 +3235,7 @@ extern int vma_expand(struct vma_iterato struct vm_area_struct *next);extern int vma_shrink (struct vma_iterator *vmi,struct vm_area_struct *vma,unsigned long start,unsigned long end,pgoff_t pgoff); -extern struct vm_area_struct *vma_merge (struct vma_iterator *vmi, -struct mm_struct *,struct vm_area_struct *prev,unsigned long addr, -unsigned long end,unsigned long vm_flags,struct anon_vma *, -struct file *,pgoff_t ,struct mempolicy *,struct vm_userfaultfd_ctx , -struct anon_vma_name *);extern struct anon_vma *find_mergeable_anon_vma (struct vm_area_struct *); -extern int __split_vma (struct vma_iterator *vmi,struct vm_area_struct *, -unsigned long addr,int new_below); -extern int split_vma (struct vma_iterator *vmi,struct vm_area_struct *, -unsigned long addr,int new_below);extern int insert_vm_struct (struct mm_struct *,struct vm_area_struct *);extern void unlink_file_vma (struct vm_area_struct *); extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
mm/internal.h renamed from mm/internal.h~mm-make-vma_merge-and-split_vma-internal +9 -0
@@ -1002,6 +1002,15 @@ struct page *follow_trans_huge_pmd(struc unsigned long addr, pmd_t *pmd, unsigned int flags); +/* +* mm/mmap.c +*/ +struct vm_area_struct *vma_merge (struct vma_iterator *vmi, +struct mm_struct *,struct vm_area_struct *prev,unsigned long addr, +unsigned long end,unsigned long vm_flags,struct anon_vma *, +struct file *,pgoff_t ,struct mempolicy *,struct vm_userfaultfd_ctx , +struct anon_vma_name *); +enum {/* mark page accessed */ FOLL_TOUCH =1 <<16 ,
mm/mmap.c renamed from mm/mmap.c~mm-make-vma_merge-and-split_vma-internal +4 -4
@@ -2346,8 +2346,8 @@ static void unmap_region(struct mm_struc* has already been checked or doesn't make sense to fail. * VMA Iterator will point to the end VMA. */ -int __split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, -unsigned long addr,int new_below) +static int __split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, +unsigned long addr,int new_below) {struct vma_prepare vp;struct vm_area_struct *new;
@@ -2428,8 +2428,8 @@ out_free_vma:* Split a vma into two pieces at address 'addr', a new vma is allocated * either for the first part or the tail. */ -int split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, -unsigned long addr,int new_below) +static int split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, +unsigned long addr,int new_below) {if (vma->vm_mm->map_count >= sysctl_max_map_count)return -ENOMEM ;
mm/nommu.c renamed from mm/nommu.c~mm-make-vma_merge-and-split_vma-internal +2 -2
@@ -1305,8 +1305,8 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar* split a vma into two pieces at address 'addr', a new vma is allocated either * for the first part or the tail. */ -int split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, -unsigned long addr,int new_below) +static int split_vma (struct vma_iterator *vmi,struct vm_area_struct *vma, +unsigned long addr,int new_below) {struct vm_area_struct *new;struct vm_region *region;
_
Patches currently in -mm which might be from [email protected] are