From nobody Mon Jul 27 00:10:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h7fBg5d1hz6m991 for ; Mon, 27 Jul 2026 00:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7fBf3cgVz43hT for ; Mon, 27 Jul 2026 00:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785111050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6xt7Mn2Ru6Sbc3SHzCtvlFjmi1w0vtB+fcTI9vuxSU=; b=PQKAF8Zrk0CkFK1b9J7uxbozRMBCDCdvw44R5ymJagVudOnkjWjczqEq21XygrcCxwb7cp Et5euAdSoO+d8Bk9QDYubVyl1UCIzG4PM3JIHTZk5WeP8S7tkK0DDA5GQIHYNI13bPIg/q fLXEP+mA7Qec5+q0wY0gbHyLld5CXQtWfl/VejO4z8zHLnFz9tuY8qu3EolhkAwmaGsm7O dt4vUpFIqARBabOCByX6wRQvShTTv2mb15sWY9Mpp5Sd08j9o14jOTBVjZaK7l52tGha4m GidWmOW/Y+2hRWDkZJyH0M8oB83ArIM5wEmocp+spwMYL1lNhFmgOmM03FLhFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785111050; a=rsa-sha256; cv=none; b=H9J8MQZZkjgglBPB3mHXZ0JUTU/qH9Y47WslR2t8sLem65EVjQ7wHgcjEOYKFytcqXFMCK dZEOVOVoaqGnScNlqUcV66HlQjxT1wTrHYIJuOXmedYJEtP/0pEII9zR+YQ3CXm3HHac98 ZUGe7s8xijDHlg12fdOADpvnWYDyjInmTLIPr9OjleKiuB+2V+3ikfP5zRHRyFuZdiOPDR P0fmq4KVaC2+fAXEtE+1PxZgso+8NTYvc+gBzvDCbh18ark+ZqMwjy/bN6UkUsjYalaYeC 48k4HGsXGka+KuBvyN7b6Cr5Xi4ZO/++SEwnh6ELXFRc8r1MUrlooM75KQtObg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785111050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6xt7Mn2Ru6Sbc3SHzCtvlFjmi1w0vtB+fcTI9vuxSU=; b=aVEpuDho41if955WYlswhykphij/Cwu1dy0B5RdcckUh02K+FE4uWVLpiyVilH7kO4IzJJ xXzTeh4jcgsNSJvUjz0cfDJasAeckSw23q568e1dl3Nf44TkcPgYtjeufWL3lZjXuACn3Q oSA9nys8kO/5fy/YVX6CeVWO11eHJB2Qtf2HUCPJCs6+wjqNrv6sFton4nzMyA/Dn2Wst6 yVN8zj+51fVoBITzHUqTZY+QKSF71BfuI4AiSdRRtJywNC6vNjpJcVMqnUWhzeX/bnj5di jKFJ7pDByFttdm5eTdRBqglq8ti4QL8gRTZve4kJRXVibsbKJeNRNsTFz8/XuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fBf2PkRzknc for ; Mon, 27 Jul 2026 00:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fa8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:10:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 7e06bfdd1489 - stable/15 - LinuxKPI: page.h: resort lines List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7e06bfdd1489e00d9fe72e596462670002d93bba Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:10:50 +0000 Message-Id: <6a66a20a.25fa8.611538e4@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e06bfdd1489e00d9fe72e596462670002d93bba commit 7e06bfdd1489e00d9fe72e596462670002d93bba Author: Bjoern A. Zeeb AuthorDate: 2026-07-17 13:12:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-26 16:49:06 +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 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D58299 (cherry picked from commit 0b8d22019dcf708a8d047817963658783cd53c46) --- 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