The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8d22019dcf708a8d047817963658783cd53c46
commit 0b8d22019dcf708a8d047817963658783cd53c46 Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2026-07-17 13:12:56 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2026-07-24 19:33:57 +0000 LinuxKPI: page.h: resort lines Two of the "page macros" can be abstracted elsewhere in the upcoming struct page work, so sort them away from the four which are here to stay. No functional change. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D58299 --- sys/compat/linuxkpi/common/include/linux/page.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h index eb0083f5fecc..8271d2d63021 100644 --- a/sys/compat/linuxkpi/common/include/linux/page.h +++ b/sys/compat/linuxkpi/common/include/linux/page.h @@ -72,13 +72,14 @@ pgprot2cachemode(pgprot_t prot) return (VM_MEMATTR_DEFAULT); } -#define page_to_virt(page) linux_page_address(page) #define virt_to_page(x) PHYS_TO_VM_PAGE(vtophys(x)) #define page_to_pfn(pp) atop(VM_PAGE_TO_PHYS(pp)) #define pfn_to_page(pfn) PHYS_TO_VM_PAGE(ptoa(pfn)) -#define nth_page(page,n) pfn_to_page(page_to_pfn(page) + (n)) #define page_to_phys(page) VM_PAGE_TO_PHYS(page) +#define page_to_virt(page) linux_page_address(page) +#define nth_page(page,n) pfn_to_page(page_to_pfn(page) + (n)) + #define pgprot_noncached(prot) \ (((prot) & VM_PROT_ALL) | cachemode2protval(VM_MEMATTR_UNCACHEABLE)) #ifdef VM_MEMATTR_WRITE_COMBINING
