From cf2a6c7f3cec74095ec586b90d0b87300c5d3b58 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Mon, 25 Apr 2016 10:34:45 -0400
Subject: [PATCH] Initialize the PageAllocator as part of the memory subsystem

Almost there!
---
 src/memory/Memory.cc | 3 +--
 src/memory/Memory.hh | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/memory/Memory.cc b/src/memory/Memory.cc
index 04c3e81..0bbcd1f 100644
--- a/src/memory/Memory.cc
+++ b/src/memory/Memory.cc
@@ -37,8 +37,7 @@ MemoryManager::initialize(const StartupInformation& startupInformation)
 
     initializeGDT();
     mFrameAllocator.initialize(startupInformation);
-
-    void* page = mFrameAllocator.allocate();
+    mPageAllocator.initialize(startupInformation, &mFrameAllocator);
 }
 
 /*
diff --git a/src/memory/Memory.hh b/src/memory/Memory.hh
index 4bf1e44..9782025 100644
--- a/src/memory/Memory.hh
+++ b/src/memory/Memory.hh
@@ -13,6 +13,7 @@
 #include "Descriptors.hh"
 #include "StartupInformation.hh"
 #include "memory/FrameAllocator.hh"
+#include "memory/PageAllocator.hh"
 
 
 namespace kernel {
@@ -25,7 +26,8 @@ struct MemoryManager
 
 private:
     x86::GDT mGDT;
-    kernel::FrameAllocator mFrameAllocator;
+    FrameAllocator mFrameAllocator;
+    PageAllocator mPageAllocator;
 
     void initializeGDT();
 };