From f02c98cd2cebdf71963ffaf34e10abf029ee7f33 Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Thu, 19 Sep 2019 14:31:12 +0900 Subject: [PATCH] Change the definition of PAGE_ATTR_NO_EXEC for now, since we don't support it yet anyways --- kernel/arch/paging.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/arch/paging.h b/kernel/arch/paging.h index d21a1df..7fff3d1 100644 --- a/kernel/arch/paging.h +++ b/kernel/arch/paging.h @@ -30,7 +30,7 @@ #define REGION_RODATA 5 struct region { - struct region *next; + struct region *reg_next; void *reg_base; u32_t reg_flags; @@ -45,7 +45,7 @@ struct pagedir { void *pd_base; u32_t pd_flags; - struct region pd_regions[3]; + struct region *pd_regions; }; typedef struct pdpt pdpt_t; @@ -86,7 +86,7 @@ struct pae_page_table { #define PAGE_ATTR_DIRTY (1 << 6) #define PAGE_ATTR_SIZE (1 << 7) #define PAGE_ATTR_GLOBAL (1 << 8) -#define PAGE_ATTR_NO_EXEC (1 << 63) +#define PAGE_ATTR_NO_EXEC 0 /* (1 << 63) */ void* pg_frame_alloc_start(void); void* pg_frame_alloc_end(void); -- 2.47.3