git: 294c52d969df - main - amd64 pmap: Fix compilation when superpage reservations are disabled
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 12 Jul 2023 17:09:32 UTC
The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=294c52d969dfdaf1d9b3f4a1de76b702ee724afc commit 294c52d969dfdaf1d9b3f4a1de76b702ee724afc Author: Yufeng Zhou <yz70@rice.edu> AuthorDate: 2023-07-12 07:52:02 +0000 Commit: Alan Cox <alc@FreeBSD.org> 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