summaryrefslogtreecommitdiff
path: root/Source/Kernel/MemoryManager
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-09-12 19:31:53 +0200
committerAlexis211 <alexis211@gmail.com>2009-09-12 19:31:53 +0200
commit267bda33af7c2f4efa107496a9cbd6726b53a101 (patch)
tree1fc9cc78017c98e58ee539dad45f78ea97419684 /Source/Kernel/MemoryManager
parent7b0d6ac9f903296c7537cec9ac606d49cb364049 (diff)
downloadMelon-267bda33af7c2f4efa107496a9cbd6726b53a101.tar.gz
Melon-267bda33af7c2f4efa107496a9cbd6726b53a101.zip
Fixed some bugs
Diffstat (limited to 'Source/Kernel/MemoryManager')
-rw-r--r--Source/Kernel/MemoryManager/Mem.ns.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Kernel/MemoryManager/Mem.ns.cpp b/Source/Kernel/MemoryManager/Mem.ns.cpp
index 5d30f5f..fa407d6 100644
--- a/Source/Kernel/MemoryManager/Mem.ns.cpp
+++ b/Source/Kernel/MemoryManager/Mem.ns.cpp
@@ -78,7 +78,7 @@ void removeFromHeapIndex(heap_header_t *e) {
//***************************************************************************
void createHeap() {
u32int heapIndexSize = PhysMem::total() * 64 + 0x10000;
- heapStart = placementAddress + 0x10000; //Set initial heap start
+ heapStart = (placementAddress & 0xFFFFF000) + 0x10000; //Set initial heap start
heapEnd = heapStart + HEAP_MIN_SIZE + heapIndexSize; //Set heap end
//Alocate frames for the heap