From 0584b545dfa1136ca080863f2fca988b9af5fd2b Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 26 Feb 2024 23:00:49 -0500 Subject: kernel: pmap: Use PROT_ instead of PMAP_ prefix Signed-off-by: Ian Moffett --- sys/arch/amd64/amd64/pmap.c | 4 ++-- sys/include/vm/map.h | 1 + sys/include/vm/pmap.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index 8a21f63..2fcab57 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -60,9 +60,9 @@ pmap_prot_to_pte(vm_prot_t prot) { uint64_t pte_flags = PTE_P | PTE_NX; - if (__TEST(prot, PMAP_WRITABLE)) + if (__TEST(prot, PROT_WRITE)) pte_flags |= PTE_RW; - if (__TEST(prot, PMAP_EXEC)) + if (__TEST(prot, PROT_EXEC)) pte_flags &= ~(PTE_NX); return pte_flags; diff --git a/sys/include/vm/map.h b/sys/include/vm/map.h index 679831b..603da92 100644 --- a/sys/include/vm/map.h +++ b/sys/include/vm/map.h @@ -31,6 +31,7 @@ #define _VM_MMAP_H_ #include +#include #include int vm_map_create(vaddr_t va, paddr_t pa, vm_prot_t prot, size_t bytes); diff --git a/sys/include/vm/pmap.h b/sys/include/vm/pmap.h index 6e37a00..7a8d577 100644 --- a/sys/include/vm/pmap.h +++ b/sys/include/vm/pmap.h @@ -50,8 +50,8 @@ #include /* prot flags for mappings */ -#define PMAP_WRITABLE __BIT(0) /* Writable */ -#define PMAP_EXEC __BIT(1) /* Executable */ +#define PROT_WRITE __BIT(0) /* Writable */ +#define PROT_EXEC __BIT(1) /* Executable */ #define is_vas_valid(vas) (vas.top_level != 0) -- cgit v1.2.3