From 97c5f8569a845b6e9b3f75460b3b90a2de9b72a8 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Thu, 11 Aug 2022 00:26:36 +0200 Subject: heap --- kernel/src/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'kernel/src/main.c') diff --git a/kernel/src/main.c b/kernel/src/main.c index b562c74..7cc1084 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -7,17 +7,16 @@ #include #include #include +#include int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic); int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) { init_paging(); -// init_heap(HEAP_START_ADDR, HEAP_SIZE, HEAP_BLOCK_SIZE); init_idt(); + init_heap(); init_fb(multiboot_bootinfo, multiboot_magic); - __asm__ volatile ("movl $4, 0x500000"); - for(;;) { __asm__ volatile ("hlt;"); } -- cgit v1.2.3