3 files changed, 13 insertions, 11 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index f1d6496..c89ae44 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -3,7 +3,6 @@
 #include "arch/exception_handling/assert.hpp"
 #include "arch/memory/allocator/area_frame_allocator.hpp"
 #include "arch/memory/multiboot/reader.hpp"
-#include "arch/memory/paging/active_page_table.hpp"
 #include "arch/memory/paging/temporary_page.hpp"
 #include "arch/video/vga/text.hpp"
 
diff --git a/arch/x86_64/src/memory/paging/active_page_table.cpp b/arch/x86_64/src/memory/paging/active_page_table.cpp
index 5f31f75..38696f8 100644
--- a/arch/x86_64/src/memory/paging/active_page_table.cpp
+++ b/arch/x86_64/src/memory/paging/active_page_table.cpp
@@ -93,14 +93,4 @@ namespace teachos::arch::memory::paging
   {
     // Nothing to do
   }
-
-  auto active_page_table::with(inactive_page_table inactive_page_table, temporary_page temporary_page,
-                               active_page_table::function f) -> void
-  {
-    active_handle[511].set_entry(inactive_page_table.page_table_level_4_frame, entry::PRESENT | entry::WRITABLE);
-    invalidate_page_cache(PAGE_TABLE_LEVEL_4_ADDRESS);
-
-    f(*mapper);
-  }
-
 }  // namespace teachos::arch::memory::paging
diff --git a/arch/x86_64/src/memory/paging/kernel_mapper.cpp b/arch/x86_64/src/memory/paging/kernel_mapper.cpp
new file mode 100644
index 0000000..9dfc5ad
--- /dev/null
+++ b/arch/x86_64/src/memory/paging/kernel_mapper.cpp
@@ -0,0 +1,13 @@
+#include "arch/memory/paging/kernel_mapper.hpp"
+
+namespace teachos::arch::memory::paging
+{
+  auto with(inactive_page_table inactive_page_table, temporary_page temporary_page,
+            active_page_table::function f) -> void
+  {
+    /*active_handle[511].set_entry(inactive_page_table.page_table_level_4_frame, entry::PRESENT | entry::WRITABLE);
+    invalidate_page_cache(PAGE_TABLE_LEVEL_4_ADDRESS);
+
+    f(*this);*/
+  }
+}  // namespace teachos::arch::memory::paging