acpi

1 files changed, 8 insertions, 2 deletions

diff --git a/kernel/memory/memory.c b/kernel/memory/memory.c
index 1334051..145ce2b 100644
--- a/kernel/memory/memory.c
+++ b/kernel/memory/memory.c
@@ -1,15 +1,21 @@
 #include <comus/memory.h>
 #include <comus/asm.h>
+#include <comus/mboot.h>
+#include <lib.h>
 
 #include "paging.h"
 #include "virtalloc.h"
 #include "physalloc.h"
 
-void memory_init(struct memory_map *map)
+void memory_init(void)
 {
+	struct memory_map mmap;
+	if (mboot_get_mmap(&mmap))
+		panic("failed to load memory map");
+
 	cli();
 	paging_init();
 	virtaddr_init();
-	physalloc_init(map);
+	physalloc_init(&mmap);
 	sti();
 }