The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8dad29555a5807bf21941807752e1589e20312de
commit 8dad29555a5807bf21941807752e1589e20312de Author: Kyle Evans <[email protected]> AuthorDate: 2026-05-19 13:35:36 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2026-05-19 13:47:35 +0000 linuxkpi: fix 32-bit arm build The new KPI is only used in <asm/set_memory.h>, but it's provided in linux_page.c. The latter only includes the former indirectly by way of <linux/io.h>, and that's only conditionally included outside of 32-bit ARM there. All of our archs have the necessary pmap_page_set_memattr(), so just move the declaration into <linux/page.h> instead of trying to reason about the usability of <asm/set_memory.h> directly in linux_page.c. Reported by: jenkins (via ivy) --- sys/compat/linuxkpi/common/include/asm/set_memory.h | 2 -- sys/compat/linuxkpi/common/include/linux/page.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h index f45a51a9710b..99f421b049cd 100644 --- a/sys/compat/linuxkpi/common/include/asm/set_memory.h +++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h @@ -62,8 +62,6 @@ set_memory_wb(unsigned long addr, int numpages) return (-pmap_change_attr((void *)addr, len, VM_MEMATTR_WRITE_BACK)); } -int lkpi_set_pages_attr(struct page *page, int numpages, vm_memattr_t ma); - static inline int set_pages_uc(struct page *page, int numpages) { diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h index 37ab593a64e9..6f5f37d2fd0f 100644 --- a/sys/compat/linuxkpi/common/include/linux/page.h +++ b/sys/compat/linuxkpi/common/include/linux/page.h @@ -127,4 +127,6 @@ clflush_cache_range(void *addr, unsigned int size) } #endif +int lkpi_set_pages_attr(struct page *page, int numpages, vm_memattr_t ma); + #endif /* _LINUXKPI_LINUX_PAGE_H_ */
