From nobody Fri Jul 24 19:35:03 2026 X-Original-To: dev-commits-src-main@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 4h6J9N25hzz6mcxy for ; Fri, 24 Jul 2026 19:35:04 +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 4h6J9N0N1pz3PWq for ; Fri, 24 Jul 2026 19:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784921704; 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=9RXAsXb/M0Yb8437Er8yEyGbN1j6z8J4X/hZkE5es3E=; b=eHFmRe2mTnns41IUXLLUYAx5FgDcZXvw+tU1Li20ysGbMl3LGObj7Z7M8Y0Ov5QiayHNO6 ioyhw6PQ0h4UDZdpKFKDq9J1b3B4PcCDb24q3+dm4thVYwMA6JNFuaUtgFS796/CQeqAWG tK3qbk7KsvkgM1ugM4qEwzi3PE1ZpPb3MN10+7JnEvHGp0UT0ZeJiSYHKurWmlbXuBtOyT LZ90ixTe4esdmIuKl7CevYE4nxEEOBusTgrVDbynS+jG+vmZekBPBIubIYQ4KdrETWFHE+ DZR+sPS85b8e/RtKVxuuC3NcSEGrf3Uqhf3HTSumtFq4LtSoFWUP+Me5VWV7lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784921704; a=rsa-sha256; cv=none; b=Bc75nNXjTmdXyVdVai7md6SBltP7+xBjWGDtbXkD3yUh25ReEUExTxIem9sLvE3djcvXiL pi9YjcZLwD6w0DgOKEEOdNTBZzSX3WW6yM0Lv3nISrzJr+jDNpHiECcb5XgD4WfI0/9gQU cIYs0xSaozJ/9GSlAeNO/YImu6VyRr+fAvi2uaD7QTucOqx0fa5Bprq+rfmOBYbHwPY6Wm SGKmyDEn9Gdr5AsnHmG9OvoZ9+hkBTs5uOoOq2MprkGFgATP01K/BN29DzSRYWaUfxms6H 4AMT3gt/LH2En7vDl4jbULbYAhiIlOCjYEwmKjUU1kTh3BHn8G0iB7RAryzMhw== 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=1784921704; 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=9RXAsXb/M0Yb8437Er8yEyGbN1j6z8J4X/hZkE5es3E=; b=rfma4c032f9V+rTrT672e/9srXQRN5k+CZb8X5tbkH1L1LC/RcTmhXcRC96DKsnN0QtG4U PsccLCrWpnViGpocEmPG8J0mPMyhqoZZTu59y2MG3waisY/4SpBDe9Ld1K7CLTtQ/LRl8M dmH16H6Pti4Jud455vTB4uicKNryJYovZO8Skqx9KFqfpybwye1xMQJ2nr8QmGJd5urefe OB5tq/f5a4Ku+3s503kCgG5l8qahV6EzvbCLnJ7tVbfD04tDw8EINLtEhJdAGgA4c+3bpg uZqArvYQImTxkoRF9xGxXFi8nzJ1QfddODTLxmGwayYh0mXsrEgyBryDOL93/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6J9M67l2z14v5 for ; Fri, 24 Jul 2026 19:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 253cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 19:35:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f45506c6a6f4 - main - LinuxKPI: page.h: use atop() and ptoa() instead of PAGE_SHIFT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f45506c6a6f4742cd5129d636902b61045c4754b Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 19:35:03 +0000 Message-Id: <6a63be67.253cb.5154dc76@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f45506c6a6f4742cd5129d636902b61045c4754b commit f45506c6a6f4742cd5129d636902b61045c4754b Author: Bjoern A. Zeeb AuthorDate: 2026-07-17 13:09:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-24 19:33:56 +0000 LinuxKPI: page.h: use atop() and ptoa() instead of PAGE_SHIFT With upcoming changes to 'struct page' this will make the lines easier to read by using the predefined macros from param.h. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: markj, kib Differential Revision: https://reviews.freebsd.org/D58298 --- sys/compat/linuxkpi/common/include/linux/page.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h index a8e266af95fd..eb0083f5fecc 100644 --- a/sys/compat/linuxkpi/common/include/linux/page.h +++ b/sys/compat/linuxkpi/common/include/linux/page.h @@ -74,8 +74,8 @@ pgprot2cachemode(pgprot_t prot) #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) (VM_PAGE_TO_PHYS(pp) >> PAGE_SHIFT) -#define pfn_to_page(pfn) (PHYS_TO_VM_PAGE((pfn) << PAGE_SHIFT)) +#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)