Clean up stray cases that don't fit the 4 states.

CTSRD-CHERI · Jul 11, 2024 · 99123b5 · 99123b5
1 parent 57121f2
commit 99123b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h
@@ -132,7 +132,7 @@ typedef	uint64_t	pt_entry_t;		/* page table entry */
  * ATTR_CAP_RW as a single operand, so separate orr instructions are
  * required for ATTR_CAP_RW.
  */
-#define	ATTR_CAP_RW	(ATTR_LC_ENABLED | ATTR_SC)
+#define	ATTR_CAP_RW	ATTR_CAP_GEN0
 #endif
 #define	ATTR_DEFAULT	(ATTR_AF | ATTR_SH(ATTR_SH_IS))
 

diff --git a/sys/arm64/vmm/vmm_mmu.c b/sys/arm64/vmm/vmm_mmu.c
@@ -309,10 +309,10 @@ vmmpmap_enter(vm_offset_t va, vm_size_t size, vm_paddr_t pa, vm_prot_t prot)
 	}
 #if __has_feature(capabilities)
 	if ((prot & VM_PROT_READ_CAP) != 0) {
-		l3e |= ATTR_LC_ENABLED;
+		l3e |= ATTR_CAP_GEN0;
 	}
 	if ((prot & VM_PROT_WRITE_CAP) != 0) {
-		l3e |= ATTR_SC;
+		l3e |= ATTR_CAP_GEN0;
 	}
 #endif