git: 5abab0f952ba - stable/13 - Remove a redundant L1_BLOCK == L2_BLOCK check
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Apr 2022 11:06:09 UTC
The branch stable/13 has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=5abab0f952ba98fb68cacc0d3f6cdafddf9ba629
commit 5abab0f952ba98fb68cacc0d3f6cdafddf9ba629
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-03-15 14:02:38 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-04-04 09:37:07 +0000
Remove a redundant L1_BLOCK == L2_BLOCK check
We have two checks for L1_BLOCK == L2_BLOCK. Remove one.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 51f5cafcdc47357596cac8c6166331beb264df39)
---
sys/arm64/arm64/pmap.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 924b82f01313..95587b84f403 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -1306,7 +1306,6 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
KASSERT(lvl > 0 && lvl <= 3,
("pmap_extract_and_hold: Invalid level %d", lvl));
- CTASSERT(L1_BLOCK == L2_BLOCK);
KASSERT((lvl == 3 && (tpte & ATTR_DESCR_MASK) == L3_PAGE) ||
(lvl < 3 && (tpte & ATTR_DESCR_MASK) == L1_BLOCK),
("pmap_extract_and_hold: Invalid pte at L%d: %lx", lvl,