Index: sys/arch/aarch64/include/pmap.h
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/include/pmap.h,v
retrieving revision 1.57
diff -u -p -r1.57 pmap.h
--- sys/arch/aarch64/include/pmap.h	3 Nov 2022 09:04:56 -0000	1.57
+++ sys/arch/aarch64/include/pmap.h	27 Dec 2022 13:52:27 -0000
@@ -202,7 +202,6 @@ paddr_t vtophys(vaddr_t);
 
 /* mmap cookie and flags */
 #define AARCH64_MMAP_FLAG_SHIFT		(64 - PGSHIFT)
-#define AARCH64_MMAP_FLAG_MASK		0xf
 #define AARCH64_MMAP_WRITEBACK		0UL
 #define AARCH64_MMAP_NOCACHE		1UL
 #define AARCH64_MMAP_WRITECOMBINE	2UL
@@ -236,7 +235,7 @@ aarch64_mmap_flags(paddr_t mdpgno)
 	 * but pmap has PMAP_{NOCACHE,WRITE_COMBINE,WRITE_BACK} flags.
 	 */
 
-	nflag = (mdpgno >> AARCH64_MMAP_FLAG_SHIFT) & AARCH64_MMAP_FLAG_MASK;
+	nflag = __SHIFTOUT(mdpgno, ARM_MMAP_MASK);
 	switch (nflag) {
 	case AARCH64_MMAP_DEVICE:
 		pflag = PMAP_DEV;