aboutsummaryrefslogtreecommitdiff
path: root/include/kern/mem.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/kern/mem.h')
-rw-r--r--include/kern/mem.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/kern/mem.h b/include/kern/mem.h
index c0999f5..832d31d 100644
--- a/include/kern/mem.h
+++ b/include/kern/mem.h
@@ -11,18 +11,18 @@
((16384 - (DATA_SEGMENT_STOP_ADDR - DATA_SEGMENT_START_ADDR)) / 4 * 4)
/* allocates memory on the head, which is stored in sram2 */
-void* halloc(size_t n);
+void* kalloc(size_t n);
-/* Frees the memory allocated by halloc. */
-void hfree(void* mem);
+/* Frees the memory allocated by kalloc. */
+void kfree(void* mem);
#ifdef FOR_TESTING
-void* debug_halloc_get_next_ptr(void* ptr);
+void* debug_kalloc_get_next_ptr(void* ptr);
-void* debug_halloc_get_prev_ptr(void* ptr);
+void* debug_kalloc_get_prev_ptr(void* ptr);
-int debug_halloc_assert_consistency(char* error, size_t len);
+int debug_kalloc_assert_consistency(char* error, size_t len);
void debug_print_blocks();