Use passed allocator in inactive page instead of tiny.

3 files changed, 8 insertions, 5 deletions

diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 5cfd9b3..c111f22 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -20,8 +20,8 @@ namespace teachos::arch::kernel
     auto const memory_information = memory::multiboot::read_multiboot2();
     memory::allocator::area_frame_allocator allocator(memory_information);
 
-    memory::paging::kernel_mapper kernel(memory_information);
-    kernel.remap_kernel(allocator);
+    memory::paging::kernel_mapper kernel(allocator, memory_information);
+    kernel.remap_kernel();
     video::vga::text::write("Kernel remapping successfull", video::vga::text::common_attributes::green_on_black);
 
     /*
diff --git a/arch/x86_64/src/memory/paging/inactive_page_table.cpp b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
index 0b141e2..f6ecb8b 100644
--- a/arch/x86_64/src/memory/paging/inactive_page_table.cpp
+++ b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
@@ -9,6 +9,6 @@ namespace teachos::arch::memory::paging
     auto table = temporary_page.map_table_frame(page_table_level_4_frame, active_page_table);
     table.zero_entries();
     table[511].set_entry(page_table_level_4_frame, entry::PRESENT | entry::WRITABLE);
-    temporary_page.unmap(active_page_table);
+    temporary_page.unmap_page(active_page_table);
   }
 }  // namespace teachos::arch::memory::paging
diff --git a/arch/x86_64/src/memory/paging/temporary_page.cpp b/arch/x86_64/src/memory/paging/temporary_page.cpp
index 180b4a8..7b065ab 100644
--- a/arch/x86_64/src/memory/paging/temporary_page.cpp
+++ b/arch/x86_64/src/memory/paging/temporary_page.cpp
@@ -14,7 +14,10 @@ namespace teachos::arch::memory::paging
     return page.start_address();
   }
 
-  auto temporary_page::unmap(active_page_table & active_table) -> void { active_table.unmap_page(allocator, page); }
+  auto temporary_page::unmap_page(active_page_table & active_table) -> void
+  {
+    active_table.unmap_page(allocator, page);
+  }
 
   auto temporary_page::map_table_frame(allocator::physical_frame frame,
                                        active_page_table & active_table) -> page_table_handle
@@ -33,6 +36,6 @@ namespace teachos::arch::memory::paging
     handle.zero_entries();
     handle[511].set_entry(frame.value(), entry::PRESENT | entry::WRITABLE);
 
-    unmap(active_table);
+    unmap_page(active_table);
   }
 }  // namespace teachos::arch::memory::paging