From nobody Fri Jul 24 19:35:04 2026 X-Original-To: dev-commits-src-all@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 4h6J9P5HhJz6mckH for ; Fri, 24 Jul 2026 19:35:05 +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 4h6J9P2Plnz3PrG for ; Fri, 24 Jul 2026 19:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784921705; 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=n+ji45Hj0Y8GIjq1hCJWKCGtuiZSG8K/TpELBjRrdgU=; b=j6beUWx8dg9evdp6uqg6VDJHHZd9nGN1q8/foidHNE+RCyod6J5fx6Exo8FdzkPGpDUWu4 ufoZx86iMfTStoURykf9UbZeMMq9o7Mp72ekGzsBf36zJ5iG5aPRF/3ufWv9WkOYV1FJYh 2t8K7xxBm/6Ln5kXarW2Sda4MCVHXxntmKL4bDtZ5yswyxHPA04PYS30ZPii1a06MqUsO0 m0xUnKh1wct4tZw18b26+iCioKb+aKSATm3ubboCr+VPJ4Rdc7h5w2wMgUshC5/dgP+sGV LiAIyVYLW4gwT29QOaVMX7A4PEfEf7GC320E9jk6pau8FP6pJ1uptcW5tpQAcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784921705; a=rsa-sha256; cv=none; b=vXJ3INM2u5WRwZ9TrcASol5fw4l9+90uvnKVdX7b2/d7mNOyuNU4TCzCB2gZzztK5jUilf O4spo6gchfK8+HiqRBWGzgIFI/AWDxjrxNkfoCxJKYI7AvybTlP5GErup3X2FxNm3nlILP MzB0w/Z4BbnJbVuHPtOq9jR8hX9USW26zQu+8FQf7LNq9rwWgd//V1z4x8PnCxG3KitGWR tXwM9ZG5EEoMCqHVqtcX5resPTVO+JfjtSkagzcDZkyP/7pLPZdeUtb5LTgF6INEG5BCpA wjsQ9c8hPGQBIP2fDJfLurI3OKo3JZAX8kY3Jt3HXo3TPgGb1NEkr8bY1mOp2Q== 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=1784921705; 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=n+ji45Hj0Y8GIjq1hCJWKCGtuiZSG8K/TpELBjRrdgU=; b=HQIdteNyXMfzIn+xdzkdjViJilYm7vnc1Jr/LpF0zgLWBZGWYjqZy4y0an8t86S4YZiQuW Ny7nqY0RHXo/1eykJBmIhVh8mw1dDJ9I6LwkbFPGWgMob9l2dVwHuKp4AKl5XLuWW5jqh4 jt9a5tSqSCTsxSkpvNOpW7yfBu/zZ5N+qOCg4FpO7y17B8nJMUyJMSltdRK2t02hq8Qtwi z/npb8O+jdtNVYsTCP0LnKBfaJKxuv0dOSEC43r+6tzGI+TPR1cT2ZhddeQlYuITNEHHJq 6miLpGnag9VWreSZfzYiJy3r0GkCeQUnC4dJEeaxyKk0CwlGAyExPaBEvOlWnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6J9N6xPKz155F for ; Fri, 24 Jul 2026 19:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25d1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 19:35:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0b8d22019dcf - main - LinuxKPI: page.h: resort lines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0b8d22019dcf708a8d047817963658783cd53c46 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 19:35:04 +0000 Message-Id: <6a63be68.25d1c.68f33d48@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8d22019dcf708a8d047817963658783cd53c46 commit 0b8d22019dcf708a8d047817963658783cd53c46 Author: Bjoern A. Zeeb AuthorDate: 2026-07-17 13:12:56 +0000 Commit: Bjoern A. Zeeb 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