Mem::kalloc and Mem::kfree renamed to Mem::alloc and Mem::kfree

I renamed them so that they could have the same name in userland and in
kernel space. We'll just know that if we're writing kernel code then we
are allocating stuff in kernel memory, and if we're writing user code
then we're allocating userland memory.

2 files changed, 2 insertions, 2 deletions

diff --git a/Source/Kernel/Linker/ElfBinary.class.cpp b/Source/Kernel/Linker/ElfBinary.class.cpp
index 450053f..27e5474 100644
--- a/Source/Kernel/Linker/ElfBinary.class.cpp
+++ b/Source/Kernel/Linker/ElfBinary.class.cpp
@@ -26,7 +26,7 @@ Binary* ElfBinary::load(File& file) {
 	}
 	//Load data
 	for (SimpleList<phdr_t> *iter = b->m_phdr; iter != 0; iter = iter->next()) {
-		iter->v().data = (u8int*)Mem::kalloc(iter->v().h.p_filesz);
+		iter->v().data = (u8int*)Mem::alloc(iter->v().h.p_filesz);
 		file.seek(iter->v().h.p_offset, SM_BEGINNING);
 		file.read(iter->v().h.p_filesz, iter->v().data);
 	}
diff --git a/Source/Kernel/Linker/MelonBinary.class.cpp b/Source/Kernel/Linker/MelonBinary.class.cpp
index d6074de..0737b71 100644
--- a/Source/Kernel/Linker/MelonBinary.class.cpp
+++ b/Source/Kernel/Linker/MelonBinary.class.cpp
@@ -7,7 +7,7 @@ Binary* MelonBinary::load(File& file) {
 		MelonBinary* r = new MelonBinary;
 		file.read<u32int>(&r->m_size);
 		file.read<u32int>(&r->m_org);
-		r->m_data = (u8int*)Mem::kalloc(r->m_size);
+		r->m_data = (u8int*)Mem::alloc(r->m_size);
 		file.read(r->m_size, r->m_data);
 		return r;
 	} else {