diff options
| author | Ian Moffett <ian@osmora.org> | 2024-01-17 21:01:02 -0500 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2024-01-17 21:01:02 -0500 |
| commit | 6ed63f6cee404c09ce6d2becf4ab60b891a767fe (patch) | |
| tree | 91fec5e1334675afa33b6f3034c7c61e1ffb6860 | |
| parent | 469f601e210a74bb08408be894c9ec84701d6715 (diff) | |
kernel: vm: Init virtual memory in pre_init()
Signed-off-by: Ian Moffett <ian@osmora.org>
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 5 | ||||
| -rw-r--r-- | sys/kern/init_main.c | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index f5b6365..1194b63 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -38,6 +38,8 @@ #include <machine/spectre.h> #include <machine/cpu.h> #include <machine/uart.h> +#include <vm/vm.h> +#include <vm/physseg.h> #include <firmware/acpi/acpi.h> __MODULE_NAME("machdep"); @@ -104,6 +106,9 @@ pre_init(void) uart8250_try_init(); interrupts_init(); gdt_load(&g_gdtr); + + vm_physseg_init(); + vm_init(); } void diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 8b8e431..99f1e87 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -34,7 +34,6 @@ #include <sys/timer.h> #include <firmware/acpi/acpi.h> #include <vm/physseg.h> -#include <vm/vm.h> #include <logo.h> __MODULE_NAME("init_main"); @@ -84,18 +83,6 @@ main(void) acpi_init(); - /* - * TODO: Move these calls to machdep.c whenever - * possible. It must be documented that - * this will only be called by processor_init() - * as the pmap subsystem may rely on architecture - * specifics that haven't been set up yet... Putting - * these calls in processor_init() makes things more - * flexible. - */ - vm_physseg_init(); - vm_init(); - processor_init(); list_timers(); |