1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86_64/src/kapi/memory.cpp b/arch/x86_64/src/kapi/memory.cpp
index 55e6ba9..be47941 100644
--- a/arch/x86_64/src/kapi/memory.cpp
+++ b/arch/x86_64/src/kapi/memory.cpp
@@ -1,6 +1,7 @@
 #include "kapi/memory.hpp"
 
 #include "kapi/memory/frame.hpp"
+#include "kapi/memory/frame_allocator.hpp"
 #include "kapi/system.hpp"
 
 #include "x86_64/boot/boot.hpp"
@@ -21,6 +22,7 @@ namespace teachos::memory
   namespace
   {
     auto constinit is_initialized = std::atomic_flag{};
+    auto constinit allocator = static_cast<frame_allocator *>(nullptr);
 
     auto create_memory_information() -> region_allocator::memory_information
     {
@@ -34,6 +36,16 @@ namespace teachos::memory
     };
   }  // namespace
 
+  auto active_allocator() -> frame_allocator &
+  {
+    if (!allocator)
+    {
+      system::panic("[x86_64] The frame allocator has not been set yet.");
+    }
+
+    return *allocator;
+  }
+
   auto init() -> void
   {
     if (is_initialized.test_and_set())