1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 0022a4c..a17db9a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,8 +3,8 @@
 
 #include "vga.h"
 #include "interrupt.h"
-#include "string.h"
 #include "multiboot.h"
+#include "memory.h"
 #include "printf.h"
 
 extern void *gdt;
@@ -29,11 +29,12 @@ const char *pope =
 "by means of its diplomatic relations and political accords with many           \n"
 "independent states.\n";
 
-void kernel_main(multiboot_info_t *mbd) {
+void kernel_main(multiboot_info_t *mb) {
 	vsetcolor(vga_color(vga_black, vga_white));
 	vclear();
 	interrupt_init();
 	start_interrupts();
+	init_memory(mb);
 	
 	vprint("      _ _                                   \n");
 	vprint("  ___(_) |_ _ __ ___  _ __  ___    ___  ___ \n");
@@ -43,5 +44,5 @@ void kernel_main(multiboot_info_t *mbd) {
                                             
 	vprint(pope);
 
-	while (1) asm("hlt");
+	while (1) asm volatile("hlt");
 }