The patch titled Subject: mm: fixup vma.h for nommu has been added to the -mm mm-unstable branch. Its filename is mm-remove-duplicated-include-in-vma_internalh-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-remove-duplicated-include-in-vma_internalh-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx> Subject: mm: fixup vma.h for nommu Date: Sun, 25 Aug 2024 12:29:47 +0100 Some series of includes result in vma.h being imported by nommu under certain circumstances, which references FIRST_USER_ADDRESS and USER_PGTABLES_CEILING, neither of which are necessarily defined in a nommu scenario. Work around this by wrapping the inline function which references these (init_vma_munmap()) in an #ifdef CONFIG_MMU. Link: https://lkml.kernel.org/r/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx> Reported-by: SeongJae Park <sj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vma.h | 2 ++ 1 file changed, 2 insertions(+) --- a/mm/vma.h~mm-remove-duplicated-include-in-vma_internalh-fix +++ a/mm/vma.h @@ -225,6 +225,7 @@ static inline int vma_iter_store_gfp(str } +#ifdef CONFIG_MMU /* * These three helpers classifies VMAs for virtual memory accounting. */ @@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl { return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE; } +#endif static inline void vma_iter_config(struct vma_iterator *vmi, _ Patches currently in -mm which might be from lorenzo.stoakes@xxxxxxxxxx are userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc.patch userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc-fix.patch mm-move-vma_modify-and-helpers-to-internal-header.patch mm-move-vma_shrink-vma_expand-to-internal-header.patch mm-move-internal-core-vma-manipulation-functions-to-own-file.patch maintainers-add-entry-for-new-vma-files.patch tools-separate-out-shared-radix-tree-components.patch tools-add-skeleton-code-for-userland-testing-of-vma-logic.patch mm-remove-duplicated-include-in-vma_internalh-fix.patch mm-vma-track-start-and-end-for-munmap-in-vma_munmap_struct-fix.patch tools-improve-vma-test-makefile.patch tools-add-vma-merge-tests.patch mm-introduce-vma_merge_struct-and-abstract-vma_mergevma_modify.patch mm-remove-duplicated-open-coded-vma-policy-check.patch mm-abstract-vma_expand-to-use-vma_merge_struct.patch mm-avoid-using-vma_merge-for-new-vmas.patch mm-avoid-using-vma_merge-for-new-vmas-fix.patch mm-make-vma_prepare-and-friends-static-and-internal-to-vmac.patch mm-introduce-commit_merge-abstracting-final-commit-of-merge.patch mm-refactor-vma_merge-into-modify-only-vma_merge_existing_range.patch mm-rework-vm_ops-close-handling-on-vma-merge.patch