Now using Doug Lea's malloc in kernel land. Next: same in userland.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/kernel/mem/mem.h b/src/kernel/mem/mem.h
index 093545e..b6e9622 100644
--- a/src/kernel/mem/mem.h
+++ b/src/kernel/mem/mem.h
@@ -8,11 +8,17 @@
 
 void* kmalloc_page(size_t *phys);
 void kfree_page(void* page);
-void* kmalloc(size_t size);
-void kfree(void* ptr);
+
+// Internal, used by dlmalloc
+void* ksbrk(size_t size);
+void kbrk(void* ptr);
+
+#define kmalloc dlmalloc
+#define kfree dlfree
 
 void kheap_init();
 
+extern int _no_more_ksbrk;
 extern size_t mem_placementAddr;
 extern void end;	//Symbol defined by linker : end of kernel code