summaryrefslogtreecommitdiff
path: root/Source/Kernel/MemoryManager
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-08-29 19:03:00 +0200
committerAlexis211 <alexis211@gmail.com>2009-08-29 19:03:00 +0200
commit9ad8e2fe0242da26dae7fca2b180640637c8c062 (patch)
tree92fdd3f2195221a110d2c4f1f2e98bd6505578ed /Source/Kernel/MemoryManager
parent0139012d683036fb661fed62babb71f59ec9ab45 (diff)
downloadMelon-9ad8e2fe0242da26dae7fca2b180640637c8c062.tar.gz
Melon-9ad8e2fe0242da26dae7fca2b180640637c8c062.zip
We now have (partial) support for UTF-8.
Diffstat (limited to 'Source/Kernel/MemoryManager')
-rw-r--r--Source/Kernel/MemoryManager/Mem.ns.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/MemoryManager/Mem.ns.cpp b/Source/Kernel/MemoryManager/Mem.ns.cpp
index 832bd99..1d1288e 100644
--- a/Source/Kernel/MemoryManager/Mem.ns.cpp
+++ b/Source/Kernel/MemoryManager/Mem.ns.cpp
@@ -181,7 +181,7 @@ void *kalloc(u32int sz, bool align) {
if (heapIndex.data[iterator]->size >= newsize) break;
iterator++;
}
- if (iterator == heapIndex.size) { //TODO : expand heap
+ if (iterator == heapIndex.size) {
expandHeap((sz & 0xFFFFF000) + 0x1000);
return kalloc(sz); //Recurse call
}
@@ -217,7 +217,7 @@ void *kalloc(u32int sz, bool align) {
return (void*)((u32int)loc + sizeof(heap_header_t));
}
-void kfree(void *ptr) { //TODO
+void kfree(void *ptr) {
if (ptr == 0) return;
heap_header_t *header = (heap_header_t*) ((u32int)ptr - sizeof(heap_header_t));