From nobody Wed Sep 07 15:10:27 2022 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 4MN5Kc0XCPz4bPMJ; Wed, 7 Sep 2022 15:10:28 +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 4MN5Kb5vmbz3ZBc; Wed, 7 Sep 2022 15:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563427; 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=vwKH6LBrARt1/Slceo3tld51MiPv5NUsdxOvUAOa9Us=; b=UY2jbARrTD8iR2H9vBW7MRmZfpP0ICKzsQTCZHtZraB3Ypmwa9pzTgTrbWC/52g5bJrxJU Q402/QxPoJ5U6Nv6OP2kX2KIysxqk4ngv7LIX/ZeUvKtk/GwJKGVMAJdrVzuGNQsx9gS7E QZr6nmcMvQunjTkpwurcaQlwGaXLz+M0diR8gR4xmrKKqEBgYoVDF1cOQOg9u2rZx5FwPd VvKQFZ+9aDrTpIFokUDg/KNIqR634sqWuk6xq47Bz87jdk3MNe+QPcaqx8z3lh+Sb63bTT IX4sBY4FppEmgMDdcW5XZI83N187pnbup6BeMvzAxs37CcVdgQ6BAoegLTVWBQ== 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 4MN5Kb4lyTzYsx; Wed, 7 Sep 2022 15:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 287FARfb026290; Wed, 7 Sep 2022 15:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FARPC026289; Wed, 7 Sep 2022 15:10:27 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:27 GMT Message-Id: <202209071510.287FARPC026289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 794a55592a53 - stable/13 - linuxkpi: pgtable: Add more defines 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 794a55592a53d6b412303a74aa20b582a2536328 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563427; 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=vwKH6LBrARt1/Slceo3tld51MiPv5NUsdxOvUAOa9Us=; b=lwQo3Yc+obNXmPYVKzcmOFFjhZj0hBmPmHTzB8Wiq7jyXuXfWL+zZGcZamuGyNHqMUlKkZ 6ZdqqG2jeUGH0H+PAaiYzRvlOPcRzNtKBg/I6UJSItuDHElLF8nBo8lQ+d5TG97E5TQGOF S+5VY/i9bzoZ/5rKaKmmsAWgf68JhhubbSTsQ7DdwvreXxvJdnhEgW/CsiEfslSes3kZBQ bbV6n+MzprL/joU8Ie/rKBTlkW18nd2CmkU68pm2aII7gz81tGNFIh0e0biL3uS2JZqyv6 1OzlYa0Re/Fw+4Lbzo6T5uAHSM3iQeCBOFy8ceUzrdUoHqBv0Z6UgJW1tR5kLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563427; a=rsa-sha256; cv=none; b=uVE/d4gQZiXxWKugvPXd8Zlug82zS4TpHeZsuayY/8ZKMbTbAMxjSMXl4h9JprLOY5xBb+ Gkz5d9fDm+mnIovZBkteG/fMMYSZmoYEEJHhGUixzynU1LSZRWmxEw1JnbVwDR1zUVEx/N uzUjBdoIDmcy+QGbsN9VJbB1q/IufaOdOP0jns84RKDR1A1/v93MYpk/lXw4A47hrw4Db3 m1b34Vne1F3EF2XxGC5mpCcsxgcYPUudbgXBbXmWCv5E8tDZyT7XdPq3hGy1AfFWTRWdJW K0oGHvQDd2mgrLQAZWNN3QzGn5kXEKyUGsS/yXK6chyROXyDE55XUFnk9eeEOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=794a55592a53d6b412303a74aa20b582a2536328 commit 794a55592a53d6b412303a74aa20b582a2536328 Author: Emmanuel Vadot AuthorDate: 2022-08-09 09:36:44 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:05 +0000 linuxkpi: pgtable: Add more defines Needed by drm-kmod Reviewed by: bz Obtained from: drm-kmod Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36101 (cherry picked from commit fd62b3fa1e82c8de3a1abacd4587fe4142e34d96) --- sys/compat/linuxkpi/common/include/asm/pgtable.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/pgtable.h b/sys/compat/linuxkpi/common/include/asm/pgtable.h index 9e66fab8eae4..93e1bbef9a12 100644 --- a/sys/compat/linuxkpi/common/include/asm/pgtable.h +++ b/sys/compat/linuxkpi/common/include/asm/pgtable.h @@ -42,4 +42,19 @@ typedef struct page *pgtable_t; #define pgprot_decrypted(prot) (prot) +#if defined(__i386__) || defined(__amd64__) +#define _PAGE_BIT_PRESENT 0 +#define _PAGE_BIT_RW 1 +#define _PAGE_BIT_USER 2 +#define _PAGE_BIT_PWT 3 +#define _PAGE_BIT_PCD 4 +#define _PAGE_BIT_PAT 7 + +#define _PAGE_PRESENT (((pteval_t) 1) << _PAGE_BIT_PRESENT) +#define _PAGE_RW (((pteval_t) 1) << _PAGE_BIT_RW) +#define _PAGE_PWT (((pteval_t) 1) << _PAGE_BIT_PWT) +#define _PAGE_PCD (((pteval_t) 1) << _PAGE_BIT_PCD) +#define _PAGE_PAT (((pteval_t) 1) << _PAGE_BIT_PAT) +#endif + #endif /* _LINUXKPI_ASM_PGTABLE_H_ */