aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/features/syscall.c2
-rw-r--r--kernel/main.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index fbbb68b..5915d9d 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -33,7 +33,7 @@ void syscall_handler(struct regs *r)
}
case SYS_FREE: {
printf("free\n");
- free(r->ebx);
+ free((void *)r->ebx);
break;
}
case SYS_READ: {
diff --git a/kernel/main.c b/kernel/main.c
index e97dad1..7d87be5 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -13,8 +13,7 @@
void kernel_main(struct vid_info *vid_info)
{
- HEAP = 0x00f00000;
- HEAP_START = HEAP; // For malloc function
+ heap_init(0x00f00000);
boot_passed = vid_info;