From nobody Wed Jul 12 17:09:32 2023 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 4R1PNr5Bg7z4gwK0; Wed, 12 Jul 2023 17:09:32 +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 4R1PNr4mTHz4GGP; Wed, 12 Jul 2023 17:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689181772; 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=Tok00+zbnHtNgP3CawO4aT0tO+NdG9bGrTAeDEhssB8=; b=fPMWBUx0Fdt4d0DvLOjlLw6PZlwKDoeRrrYhQq6gj3tk/hE2unT7o7FfnwPcIb0vzSmrY0 hqa5kTLgLuK3HsF5eb/Q4XTlft4u2YkygLwda3RTK+KUtLG7ULMLJrcz29TOlH8vh5Z/5M w8x2kCLQopfWg3AKusEE/j9VoDmZxtLbxakQYfSTX3jHucdfjV7O7e/O5gEaebniAEHgAb BRxTZOzmMO9a8vFokYdi5tHHi78URIBmE9oOmVoTu3EaJ5siYX6gTv/gOJ1lADBUan4ySA mbfvZFm5uu1MxaSXsSK23BvB22KxIOGS+hGdoCoIndNzGdt3myKBQ7WLpIL9bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689181772; 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=Tok00+zbnHtNgP3CawO4aT0tO+NdG9bGrTAeDEhssB8=; b=P1v+Fmuism6MGHHsr3nR1zznySJjSWX0FTom9Hq8bk4NQvkBeQEbelTlCK14JgdJA1JU4m A62MbjZuP97qTFaX3uze0MoyouDeg3SFffH4o7XLkAblnN26dIoh1a17Ok+xnthvFKa3PU XTwSttJegIMWx+foc24X07LI4HnZKLW4NR9UuHb7QZNc7KpkgZ1HCxTbQAKSk2PMXS5o1m LBYVSQQFLKt+9eSKKZCnuWmQBxn36DTtfdQkFisi0xIhHCAovynbjbiampaR5LxbzWy1Tq nnEM2jb3uN/rkSlCgzBw4Cpc3EE71xAkUPjYtwfbDk3l3M7jLXtUIrzSG/F5DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689181772; a=rsa-sha256; cv=none; b=k0VDGORXWp1ZLTlZA5gzdYxhEtT1Sr+b7Lltk515z6SJbcia/sVGC8iI9Y2fym50Qi2+nX xsE8kruw5Bh9dmAfNHEQ0Lo7CuEIWQRuASEz+TmI8FknHhJ2utF4b0k7HbclFDsoqCxZ+J yMhqLkPwCHOys6+EJoADNOCXvGuXOtmmkenzKNQnwSAKu22t2PeqJjmjEEN3HFx9QNi6Aq g6SMYxXobf2jwS9Ipo19cOIL9g5iRxdEv3vjWuv8C4ZZhp8Bi9axwuLklnz+aVulDHdMMC FU+1UG5+6NKHvsGTuVJ8rNS96zz93New09oteNGzp/reQjMmCkX6NM1dx8l9JA== 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 4R1PNr3k6mzGwX; Wed, 12 Jul 2023 17:09:32 +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 36CH9WHq093375; Wed, 12 Jul 2023 17:09:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CH9WB0093374; Wed, 12 Jul 2023 17:09:32 GMT (envelope-from git) Date: Wed, 12 Jul 2023 17:09:32 GMT Message-Id: <202307121709.36CH9WB0093374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 294c52d969df - main - amd64 pmap: Fix compilation when superpage reservations are disabled 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294c52d969dfdaf1d9b3f4a1de76b702ee724afc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=294c52d969dfdaf1d9b3f4a1de76b702ee724afc commit 294c52d969dfdaf1d9b3f4a1de76b702ee724afc Author: Yufeng Zhou AuthorDate: 2023-07-12 07:52:02 +0000 Commit: Alan Cox CommitDate: 2023-07-12 17:07:42 +0000 amd64 pmap: Fix compilation when superpage reservations are disabled The function pmap_pde_ept_executable() should not be conditionally compiled based on VM_NRESERVLEVEL. It is required indirectly by pmap_enter(..., psind=1) even when reservation-based allocation is disabled at compile time. Reviewed by: alc MFC after: 1 week --- sys/amd64/amd64/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 3215a7f8d559..896078f3c456 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6839,7 +6839,6 @@ retry: PMAP_UNLOCK(pmap); } -#if VM_NRESERVLEVEL > 0 static bool pmap_pde_ept_executable(pmap_t pmap, pd_entry_t pde) { @@ -6849,6 +6848,7 @@ pmap_pde_ept_executable(pmap_t pmap, pd_entry_t pde) return ((pde & EPT_PG_EXECUTE) != 0); } +#if VM_NRESERVLEVEL > 0 /* * Tries to promote the 512, contiguous 4KB page mappings that are within a * single page table page (PTP) to a single 2MB page mapping. For promotion