diff --git a/crate/riscv b/crate/riscv
index ed6e4c5..48dffe3 160000
--- a/crate/riscv
+++ b/crate/riscv
@@ -1 +1 @@
-Subproject commit ed6e4c5b935d9d027303da829a7508c105df3139
+Subproject commit 48dffe3f9aa6404a1bfe53de6645b53401d7499e
diff --git a/kernel/src/arch/riscv32/paging.rs b/kernel/src/arch/riscv32/paging.rs
index 95ecefe..680448b 100644
--- a/kernel/src/arch/riscv32/paging.rs
+++ b/kernel/src/arch/riscv32/paging.rs
@@ -17,9 +17,11 @@ pub fn setup_page_table(frame: Frame) {
     p2.set_recursive(RECURSIVE_PAGE_PML4, frame.clone());
 
     // Set kernel identity map
-    p2[0x40].set(Frame::of_addr(PhysAddr::new(0x10000000)), EF::VALID | EF::READABLE | EF::WRITABLE);
-    p2[KERNEL_PML4].set(Frame::of_addr(PhysAddr::new((KERNEL_PML4 as u32) << 22)), EF::VALID | EF::READABLE | EF::WRITABLE | EF::EXECUTABLE);
-    p2[KERNEL_PML4 + 1].set(Frame::of_addr(PhysAddr::new((KERNEL_PML4 as u32 + 1) << 22)), EF::VALID | EF::READABLE | EF::WRITABLE | EF::EXECUTABLE);
+    // 0x10000000 ~ 1K area
+    p2.map_identity(0x40, EF::VALID | EF::READABLE | EF::WRITABLE);
+    // 0x80000000 ~ 8K area
+    p2.map_identity(KERNEL_PML4, EF::VALID | EF::READABLE | EF::WRITABLE | EF::EXECUTABLE);
+    p2.map_identity(KERNEL_PML4 + 1, EF::VALID | EF::READABLE | EF::WRITABLE | EF::EXECUTABLE);
 
     use super::riscv::register::satp;
     unsafe { satp::set(satp::Mode::Sv32, 0, frame); }
@@ -249,4 +251,4 @@ impl FrameDeallocator for FrameAllocatorForRiscv {
     fn dealloc(&mut self, frame: Frame) {
         dealloc_frame(frame.start_address().as_u32() as usize);
     }
-}
\ No newline at end of file
+}