From cdcb75709a1cbe1eb09921434b7cd241000832d8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 28 Jun 2021 03:23:21 +0200 Subject: [PATCH] Kernel: Fix type for PageDirectory::s_cr3_map --- Kernel/VM/PageDirectory.cpp | 6 +++--- Kernel/VM/PageDirectory.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kernel/VM/PageDirectory.cpp b/Kernel/VM/PageDirectory.cpp index 43dbf60523..f584b6ab10 100644 --- a/Kernel/VM/PageDirectory.cpp +++ b/Kernel/VM/PageDirectory.cpp @@ -14,15 +14,15 @@ namespace Kernel { -static AK::Singleton> s_cr3_map; +static AK::Singleton> s_cr3_map; -static HashMap& cr3_map() +static HashMap& cr3_map() { VERIFY_INTERRUPTS_DISABLED(); return *s_cr3_map; } -RefPtr PageDirectory::find_by_cr3(u32 cr3) +RefPtr PageDirectory::find_by_cr3(FlatPtr cr3) { ScopedSpinLock lock(s_mm_lock); return cr3_map().get(cr3).value_or({}); diff --git a/Kernel/VM/PageDirectory.h b/Kernel/VM/PageDirectory.h index f60348d056..c06066cc4a 100644 --- a/Kernel/VM/PageDirectory.h +++ b/Kernel/VM/PageDirectory.h @@ -28,11 +28,11 @@ public: return page_directory; } static NonnullRefPtr create_kernel_page_directory() { return adopt_ref(*new PageDirectory); } - static RefPtr find_by_cr3(u32); + static RefPtr find_by_cr3(FlatPtr); ~PageDirectory(); - u32 cr3() const + FlatPtr cr3() const { #if ARCH(X86_64) return m_pml4t->paddr().get();