On Mon, Sep 15, 2025 at 09:36:34AM -0700, Kalesh Singh wrote:
> include/linux/mm.h | 2 --
> mm/internal.h | 2 ++
> mm/mmap.c | 21 ++++++++++++++++++++-
> mm/mremap.c | 7 ++++---
> mm/nommu.c | 2 +-
> mm/util.c | 1 -
> mm/vma.c | 10 +++++-----
> tools/testing/vma/vma_internal.h | 9 +++++++++
Will look into this properly later, but there's a conflict in vma_internal.h
atm for mm-new FYI.
> diff --git a/tools/testing/vma/vma_internal.h
> b/tools/testing/vma/vma_internal.h
> index 3639aa8dd2b0..52cd7ddc73f4 100644
> --- a/tools/testing/vma/vma_internal.h
> +++ b/tools/testing/vma/vma_internal.h
> @@ -1517,4 +1517,13 @@ static inline vm_flags_t ksm_vma_flags(const struct
> mm_struct *, const struct fi
> return vm_flags;
> }
>
> +/* Helper to get VMA count capacity */
> +static int vma_count_remaining(const struct mm_struct *mm)
> +{
> + const int map_count = mm->map_count;
> + const int max_count = sysctl_max_map_count;
> +
> + return (max_count > map_count) ? (max_count - map_count) : 0;
> +}
> +
> #endif /* __MM_VMA_INTERNAL_H */
> --
> 2.51.0.384.g4c02a37b29-goog
>
Probably because stuff got added at the end... :)
