From nobody Thu Jun 06 20:42:57 2024 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 4VwGVp0y1Zz5MxM7; Thu, 06 Jun 2024 20:42:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwGVn67YLz4qPt; Thu, 6 Jun 2024 20:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717706577; 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=ZzvPY8roJaxK4zCtWE9VqQiBWAidUMRy9dTruaUTGY8=; b=dtI5nF8UF2H07g/MQEF1wCEeMqA1WxNUwuU3HcxUFohMHhqzxoFCL1wDIewzBPiZhmgGRT lC495YaovSV3xRs1TrP4Q6GsQ3ExWeSceMM9YyvIkMoU4W/ZB0S52CMI7lpyE9GaGSFGSe t02bN4KmkvXKVpgJlA58WOAFdlgom88LpsOGMYlMeDzxUz2qQq22yIcCvYAf6B+ozYkh+B tw/03pAnuODa70sViEzgyn34BiR+AJoBBTa5uMUG/q/oSn6JK1MU8NTbblv+Ewj3DduYV1 W3G/HtjeL5bNz+ec073+A2rIyfx5CqQQbAjEwt4a2VTEyHcYdL8Ek01qxqXVFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717706577; a=rsa-sha256; cv=none; b=gH8D9gM1b1IMwA7NBp1+nfDVR9r5OGulUO3g/UTTLLIq1xRkjB2ccxOapDEvVa/+hGIg8m pRLy9PU9ijbsl5EBW4RzlWV/1LIjktvdkRZnUw8gn9HJKdNm6Mfn5bnInlo1ESRliCMxNr oQ/iR1uGrETfaielI3gf6VqulNPahxQqBKdcMvuSsCTC6oLB8XeNANwEcMg37D5DPE9IDh 7EU3jUvnzSo5iAkuz43IDIYCMUVUFOEU87W0VXEnvLew4ZN7Kg/d1Ne9AzSeFAkrjmy/Te qezQ06WkofA2MDZ74BsQnjmY5Xm2J5dm+tldjksxzkzQ9e6QKfLNVAFz1KV3Lw== 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=1717706577; 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=ZzvPY8roJaxK4zCtWE9VqQiBWAidUMRy9dTruaUTGY8=; b=tftGlrHNjRZOFXQ5TePM24winYpZhTXcqgnCFlITnZBPhJOr39qAHbsQ8fH0ImpY1JKDjr ueStqjD0EAXVDN7KtUlWGkj8b/FtHfny3a7dVDrS3/me5T3C+T1GH91gCIittxLqF8MVch RQRGv+W9NopV23NTBYrVZjoOP0omVAs1RHPJOl3VjU0tZc0VK80nbYLpgFgYARx+ZXRt25 pO/9036+6U5v2WyUn5Dbkz/+MzNgz61z4XeP4yvM6ZfyvFsNqfcUBkpBybWJr3YVCN79c2 YQa5WTgo0yEfMreShdDxMb9cFZTNgZUZV//EG57+I/SpsWyHG1c51ZlGrjVYYg== 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 4VwGVn5hMfz11Hg; Thu, 6 Jun 2024 20:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456Kgvig046174; Thu, 6 Jun 2024 20:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456Kgv5S046171; Thu, 6 Jun 2024 20:42:57 GMT (envelope-from git) Date: Thu, 6 Jun 2024 20:42:57 GMT Message-Id: <202406062042.456Kgv5S046171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: cb8bfc4db8ca - main - LinuxKPI: Move page_address definition from linux/gfp.h to linux/mm.h 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 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/main X-Git-Reftype: branch X-Git-Commit: cb8bfc4db8ca8f4ed03406a554e77a013696c8e0 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=cb8bfc4db8ca8f4ed03406a554e77a013696c8e0 commit cb8bfc4db8ca8f4ed03406a554e77a013696c8e0 Author: Vladimir Kondratyev AuthorDate: 2024-06-06 20:42:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-06-06 20:42:06 +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 --- 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 8a0ce489f19f..bd8fa1a18372 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -84,15 +84,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) {