From 76ea83e70c5c852de9efdf857f6ee95be7d6e6c8 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Tue, 8 Apr 2025 11:49:51 -0400 Subject: acpi --- kernel/memory/memory.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'kernel/memory/memory.c') 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 #include +#include +#include #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(); } -- cgit v1.2.3-freya