Pārlūkot izejas kodu

Kernel: Fix type for PageDirectory::s_cr3_map

Gunnar Beutner 4 gadi atpakaļ
vecāks
revīzija
cdcb75709a
2 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 3 3
      Kernel/VM/PageDirectory.cpp
  2. 2 2
      Kernel/VM/PageDirectory.h

+ 3 - 3
Kernel/VM/PageDirectory.cpp

@@ -14,15 +14,15 @@
 
 
 namespace Kernel {
 namespace Kernel {
 
 
-static AK::Singleton<HashMap<u32, PageDirectory*>> s_cr3_map;
+static AK::Singleton<HashMap<FlatPtr, PageDirectory*>> s_cr3_map;
 
 
-static HashMap<u32, PageDirectory*>& cr3_map()
+static HashMap<FlatPtr, PageDirectory*>& cr3_map()
 {
 {
     VERIFY_INTERRUPTS_DISABLED();
     VERIFY_INTERRUPTS_DISABLED();
     return *s_cr3_map;
     return *s_cr3_map;
 }
 }
 
 
-RefPtr<PageDirectory> PageDirectory::find_by_cr3(u32 cr3)
+RefPtr<PageDirectory> PageDirectory::find_by_cr3(FlatPtr cr3)
 {
 {
     ScopedSpinLock lock(s_mm_lock);
     ScopedSpinLock lock(s_mm_lock);
     return cr3_map().get(cr3).value_or({});
     return cr3_map().get(cr3).value_or({});

+ 2 - 2
Kernel/VM/PageDirectory.h

@@ -28,11 +28,11 @@ public:
         return page_directory;
         return page_directory;
     }
     }
     static NonnullRefPtr<PageDirectory> create_kernel_page_directory() { return adopt_ref(*new PageDirectory); }
     static NonnullRefPtr<PageDirectory> create_kernel_page_directory() { return adopt_ref(*new PageDirectory); }
-    static RefPtr<PageDirectory> find_by_cr3(u32);
+    static RefPtr<PageDirectory> find_by_cr3(FlatPtr);
 
 
     ~PageDirectory();
     ~PageDirectory();
 
 
-    u32 cr3() const
+    FlatPtr cr3() const
     {
     {
 #if ARCH(X86_64)
 #if ARCH(X86_64)
         return m_pml4t->paddr().get();
         return m_pml4t->paddr().get();