From 539984bbed414969b0c40cf181a10e9341ed2359 Mon Sep 17 00:00:00 2001
From: Yuke Peng <pykfirst@gmail.com>
Date: Thu, 29 Aug 2024 20:46:20 +0800
Subject: [PATCH] Replace read with read_raw

---
 ostd/src/arch/x86/mm/mod.rs | 2 +-
 ostd/src/arch/x86/trap.rs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ostd/src/arch/x86/mm/mod.rs b/ostd/src/arch/x86/mm/mod.rs
index e36b5f80f..74a29a790 100644
--- a/ostd/src/arch/x86/mm/mod.rs
+++ b/ostd/src/arch/x86/mm/mod.rs
@@ -130,7 +130,7 @@ pub unsafe fn activate_page_table(root_paddr: Paddr, root_pt_cache: CachePolicy)
 }
 
 pub fn current_page_table_paddr() -> Paddr {
-    x86_64::registers::control::Cr3::read()
+    x86_64::registers::control::Cr3::read_raw()
         .0
         .start_address()
         .as_u64() as Paddr
diff --git a/ostd/src/arch/x86/trap.rs b/ostd/src/arch/x86/trap.rs
index a804caaab..c99a66c4a 100644
--- a/ostd/src/arch/x86/trap.rs
+++ b/ostd/src/arch/x86/trap.rs
@@ -51,7 +51,7 @@ extern "sysv64" fn trap_handler(f: &mut TrapFrame) {
                 *f = *trapframe_wrapper.0;
             }
             &PAGE_FAULT => {
-                let page_fault_addr = x86_64::registers::control::Cr2::read().as_u64();
+                let page_fault_addr = x86_64::registers::control::Cr2::read_raw();
                 // The actual user space implementation should be responsible
                 // for providing mechanism to treat the 0 virtual address.
                 if (0..MAX_USERSPACE_VADDR).contains(&(page_fault_addr as usize)) {