Index: kernel/arch/riscv64/src/boot/boot.S
===================================================================
--- kernel/arch/riscv64/src/boot/boot.S	(revision 6c742f5e8be7b02f0ab11fb675e9209a206e67f2)
+++ kernel/arch/riscv64/src/boot/boot.S	(revision 94c5bc17234cc077ce3aa69b187ecd83b90b70da)
@@ -29,4 +29,5 @@
 #include <abi/asmtool.h>
 #include <arch/boot/boot.h>
+#include <arch/cpu.h>
 
 .section K_TEXT_START, "ax"
@@ -46,5 +47,5 @@
 	
 	/* Not reached */
-	/* FIXME: Disable interrupts */
+	csrci sstatus, SSTATUS_SIE_MASK
 	hlt0:
 		wfi
Index: kernel/arch/riscv64/src/mm/page.c
===================================================================
--- kernel/arch/riscv64/src/mm/page.c	(revision 6c742f5e8be7b02f0ab11fb675e9209a206e67f2)
+++ kernel/arch/riscv64/src/mm/page.c	(revision 94c5bc17234cc077ce3aa69b187ecd83b90b70da)
@@ -36,4 +36,5 @@
 #include <genarch/mm/page_pt.h>
 #include <arch/mm/frame.h>
+#include <arch/cpu.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -47,11 +48,4 @@
 #include <print.h>
 #include <interrupt.h>
-
-#define SATP_PFN_MASK  UINT64_C(0x00000fffffffffff)
-
-#define SATP_MODE_MASK  UINT64_C(0xf000000000000000)
-#define SATP_MODE_BARE  UINT64_C(0x0000000000000000)
-#define SATP_MODE_SV39  UINT64_C(0x8000000000000000)
-#define SATP_MODE_SV48  UINT64_C(0x9000000000000000)
 
 void page_arch_init(void)