2 files changed, 6 insertions, 4 deletions
diff --git a/arch/riscv64/include/types.h b/arch/riscv64/include/types.h
index 3e1c08b..59a2762 100644
--- a/arch/riscv64/include/types.h
+++ b/arch/riscv64/include/types.h
@@ -3,7 +3,7 @@
 
 #include <apos/types.h>
 
-typedef size_t vm_t;
-typedef size_t pm_t;
+typedef uintptr_t vm_t;
+typedef uintptr_t pm_t;
 
 #endif /* APOS_RISCV_TYPES_H */
diff --git a/arch/riscv64/include/vmem.h b/arch/riscv64/include/vmem.h
index 115f2b0..4446aef 100644
--- a/arch/riscv64/include/vmem.h
+++ b/arch/riscv64/include/vmem.h
@@ -4,6 +4,8 @@
 #include <apos/types.h>
 #include <apos/attrs.h>
 
+#define RISCV_NUM_LEAVES (4096 / sizeof(void *))
+
 #define VM_V (1 << 0)
 #define VM_R (1 << 1)
 #define VM_W (1 << 2)
@@ -19,8 +21,8 @@ enum mm_mode {
 	Sv32,
 };
 
-struct __packed vm_branch {
-	struct vm_branch *leaf[512];
+struct vm_branch {
+	struct vm_branch *leaf[RISCV_NUM_LEAVES];
 };
 
 #endif /* APOS_RISCV_VMAP_H */