Index: sys/arm64/arm64/pmap.c
===================================================================
--- sys/arm64/arm64/pmap.c
+++ sys/arm64/arm64/pmap.c
@@ -462,7 +462,7 @@
 	pd_entry_t l1, *l2p;
 
 	l1 = pmap_load(l1p);
-	KASSERT((l1 & ATTR_DESCR_MASK) == L1_TABLE,
+	KASSERT((l1 & ATTR_DESCR_TYPE_MASK) == ATTR_DESCR_TYPE_TABLE,
 	    ("%s: L1 entry %#lx is a leaf", __func__, l1));
 	l2p = (pd_entry_t *)PHYS_TO_DMAP(l1 & ~ATTR_MASK);
 	return (&l2p[pmap_l2_index(va)]);
@@ -487,7 +487,7 @@
 	pt_entry_t *l3p;
 
 	l2 = pmap_load(l2p);
-	KASSERT((l2 & ATTR_DESCR_MASK) == L2_TABLE,
+	KASSERT((l2 & ATTR_DESCR_TYPE_MASK) == ATTR_DESCR_TYPE_TABLE,
 	    ("%s: L2 entry %#lx is a leaf", __func__, l2));
 	l3p = (pt_entry_t *)PHYS_TO_DMAP(l2 & ~ATTR_MASK);
 	return (&l3p[pmap_l3_index(va)]);