The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=51f5cafcdc47357596cac8c6166331beb264df39

commit 51f5cafcdc47357596cac8c6166331beb264df39
Author:     Andrew Turner <[email protected]>
AuthorDate: 2022-03-15 14:02:38 +0000
Commit:     Andrew Turner <[email protected]>
CommitDate: 2022-03-15 17:25:28 +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
---
 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 1570bf3d0b9c..12b3bed7cb72 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -1382,7 +1382,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,

Reply via email to