diff options
author | Alexis211 <alexis211@gmail.com> | 2009-12-22 16:49:53 +0100 |
---|---|---|
committer | Alexis211 <alexis211@gmail.com> | 2009-12-22 16:49:53 +0100 |
commit | cc1193087067c7e1105bd3d788520c034f5cf619 (patch) | |
tree | 33f31cf7459fe017c35a313c88e4bfcb6f00eb8a /Source/Kernel/MemoryManager/Mem.ns.cpp | |
parent | bfec696da052c8c9320773ca69927422efebe8c7 (diff) | |
download | Melon-cc1193087067c7e1105bd3d788520c034f5cf619.tar.gz Melon-cc1193087067c7e1105bd3d788520c034f5cf619.zip |
Revert "[noncompiling commit] Started working on a segmented memory model"
This reverts commit bfec696da052c8c9320773ca69927422efebe8c7.
Diffstat (limited to 'Source/Kernel/MemoryManager/Mem.ns.cpp')
-rw-r--r-- | Source/Kernel/MemoryManager/Mem.ns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/MemoryManager/Mem.ns.cpp b/Source/Kernel/MemoryManager/Mem.ns.cpp index 712c0f3..a0809b0 100644 --- a/Source/Kernel/MemoryManager/Mem.ns.cpp +++ b/Source/Kernel/MemoryManager/Mem.ns.cpp @@ -20,7 +20,7 @@ void *kallocInternal(size_t sz, bool align) { u32int temp = placementAddress; placementAddress += sz; for (u32int i = temp; i < placementAddress; i += 0x1000) { - if (pagingEnabled) PhysMem::keSeg.allocFrame(i); + if (pagingEnabled) kernelPageDirectory->allocFrame(i, false, false); } return (void*)temp; } @@ -34,7 +34,7 @@ void createHeap() { u32int heapSize = HEAP_MIN_SIZE + heapIndexSize; //Calculate heap size for (u32int i = (placementAddress & 0xFFFFF000); i < heapStart; i += 0x1000) { - PhysMem::keSeg.allocFrame(i); + kernelPageDirectory->allocFrame(i, false, false); } kheap.create(heapStart, heapSize, heapIndexSize, kernelPageDirectory, false, false); |