The patch titled Subject: mm-make-pte_marker_swapin_error-more-general-fix has been added to the -mm mm-unstable branch. Its filename is mm-make-pte_marker_swapin_error-more-general-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-make-pte_marker_swapin_error-more-general-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-make-pte_marker_swapin_error-more-general-fix Date: Sat Jul 8 06:03:23 PM PDT 2023 fix CONFIG_MMU=n build Cc: Axel Rasmussen <axelrasmussen@xxxxxxxxxx> Cc: Peter Xu <peterx@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm_inline.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/linux/mm_inline.h~mm-make-pte_marker_swapin_error-more-general-fix +++ a/include/linux/mm_inline.h @@ -523,6 +523,7 @@ static inline bool mm_tlb_flush_nested(s return atomic_read(&mm->tlb_flush_pending) > 1; } +#ifdef CONFIG_MMU /* * Computes the pte marker to copy from the given source entry into dst_vma. * If no marker should be copied, returns 0. @@ -541,6 +542,7 @@ static inline pte_marker copy_pte_marker return dstm; } +#endif /* * If this pte is wr-protected by uffd-wp in any form, arm the special pte to _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch swap-stop-add-to-avail-list-is-swap-is-full-checkpatch-fixes.patch fs-buffer-clean-up-block_commit_write-fix.patch mm-page_alloc-avoid-false-page-outside-zone-error-info-fix.patch mm-make-pte_marker_swapin_error-more-general-fix.patch