From nobody Thu Aug 1 22:27:35 2024 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 4WZk9h3Fc4z5RZMt; Thu, 01 Aug 2024 22:27:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZk9g5syPz4YxL; Thu, 1 Aug 2024 22:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551255; 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=utt4jYwK0yZGlD4myxjE9kTvJhsfaWtTEdeAdIPE/u4=; b=jizt+pFmpIZRdcUY9gTF7njgUNyjiMsX5r/dFhERH19ZuhE33OYJSRRQRVvb0hDJNx9hfD uF+ssUTpIk+Ezjf5o1a/gHQeFaAO98nNO8Wjz9UB9aZdN+q/Fp5GJw1elY/zN4fE4wvJ0E Iaf5LFveopzf1VOC+UHJdHmhT00Ly5b3qifRiL6G280W14CSVBd0Y2R6U0foTgLkPmmRry jY96E+DKh6MQLLETK0hkfIpgTOR7Znj3NN9Wjb1wqO9aXNNOHel3CGEk5OYNoPvDiy1Dgn FSM5ttyvOFZ9iMjgYTXXHFKDLaSzsAS0E7OW3IrtgMMes58aY09PkUgAIIUC1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551255; a=rsa-sha256; cv=none; b=WV3bhpFTMigHkgXIDQ9w+32DbmNX5JZSSzmogn+rpjKHSx11LZJz6iCQ/L8mzJNhn5q/cd eYtZ1t5AXoeCTTi/Hbn2On0RIGn+1H4olSBNrjO/V7IFpqZGTLmm+U4HPSnqWCYkCKuf4F GAF4D3WeZT+DHzOTt+Ftm09I/pRXg12QhNf0qHz31lysdu/CRRFry5VigHqXE5LOlGLlyf e204v4BfOgUMFsdmwS0Tq7iFPgYCUWm8zsYUPIB2PHFk/Nhy3WfY0/6X9A/tmiE9UHjvfx X/bskB9vvXdwwWfb3rhxiXWoRi/RHPcKnUfREMrQcckE/woAXdius1HDCjw0qg== 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=1722551255; 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=utt4jYwK0yZGlD4myxjE9kTvJhsfaWtTEdeAdIPE/u4=; b=HFYa+fIf09eKfcIyl8RvZLuoS7kBiYDQvCys6MN0HaLTG0jQbdK2lnpICjZtAZsK+57fF/ sILW9F3V0x8slx+zN0iKkFcN3WPJnVGedKyK2xi/DgDUh+rWh76mIlHO/weQyCyrZxQ50W s+yii+9TuAnvpVmr1Yztv0uEFq74W/P+XLb/Qhwnpq1UusmPiAdihQCX6GsptHNdXUHGzn Awd6IlHkVDlYoL+sGNZyv0YKus2DAYGLRZnlsKdz/T6vTApW5YeCht2E2laYo9KXXiFi/Z Ai1DISuScv6kO4EmBvMGX7ua3MI8jFArG2NjXe83nczVJuOt3zv1ovLLQwCq7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZk9g5TvMz13Cv; Thu, 1 Aug 2024 22:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471MRZGV027444; Thu, 1 Aug 2024 22:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRZbY027441; Thu, 1 Aug 2024 22:27:35 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:35 GMT Message-Id: <202408012227.471MRZbY027441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 80ade5b6940e - stable/14 - LinuxKPI: Move page_address definition from linux/gfp.h to linux/mm.h 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 80ade5b6940e6f29cbb429ecc807da3f40a4edac Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=80ade5b6940e6f29cbb429ecc807da3f40a4edac commit 80ade5b6940e6f29cbb429ecc807da3f40a4edac Author: Vladimir Kondratyev AuthorDate: 2024-06-06 20:42:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:39 +0000 LinuxKPI: Move page_address definition from linux/gfp.h to linux/mm.h To match Linux. Some future changes may depend on proper location. Sponsored by: Serenity Cyber Security, LLC MFC after: 1 week Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D45448 (cherry picked from commit cb8bfc4db8ca8f4ed03406a554e77a013696c8e0) --- sys/compat/linuxkpi/common/include/linux/gfp.h | 9 --------- sys/compat/linuxkpi/common/include/linux/mm.h | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index e5dd2e44b0fa..e285f8591a3c 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -85,15 +85,6 @@ struct page_frag_cache { int pagecnt_bias; }; -/* - * Resolve a page into a virtual address: - * - * NOTE: This function only works for pages allocated by the kernel. - */ -void *linux_page_address(struct page *); - -#define page_address(page) linux_page_address(page) - /* * Page management for unmapped pages: */ diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 109bfffe7d6a..41af4be4c015 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -178,6 +178,14 @@ get_order(unsigned long size) return (order); } +/* + * Resolve a page into a virtual address: + * + * NOTE: This function only works for pages allocated by the kernel. + */ +void *linux_page_address(struct page *); +#define page_address(page) linux_page_address(page) + static inline void * lowmem_page_address(struct page *page) {