kern: Initialize ACPI early on during boot

Signed-off-by: Ian Moffett <ian@osmora.org>

3 files changed, 4 insertions, 3 deletions

diff --git a/src/sys/acpi/acpi_init.c b/src/sys/acpi/acpi_init.c
index 76c582b..bb98ff4 100644
--- a/src/sys/acpi/acpi_init.c
+++ b/src/sys/acpi/acpi_init.c
@@ -54,7 +54,7 @@ acpi_get_root_sdt(void)
  * ACPI initialization
  */
 int
-acpi_init(void)
+acpi_early_init(void)
 {
     struct bootvars bootvars;
     struct acpi_rsdp *rsdp;
diff --git a/src/sys/include/acpi/acpi.h b/src/sys/include/acpi/acpi.h
index e43d2cd..ebc2129 100644
--- a/src/sys/include/acpi/acpi.h
+++ b/src/sys/include/acpi/acpi.h
@@ -72,6 +72,6 @@ void *acpi_query(const char *query);
  * Returns zero on success, otherwise a less than zero
  * value on failure.
  */
-int acpi_init(void);
+int acpi_early_init(void);
 
 #endif  /* !_MACHINE_ACPI_H_ */
diff --git a/src/sys/os/os_init.c b/src/sys/os/os_init.c
index 2faf962..2f064fe 100644
--- a/src/sys/os/os_init.c
+++ b/src/sys/os/os_init.c
@@ -14,13 +14,14 @@ struct pcore g_bsp;
 __dead void
 main(void)
 {
+    acpi_early_init();
     cpu_conf(&g_bsp);
+
     cons_init();
     syslog_toggle(true);
 
     printf("booting l5 lunos v0.0.1...\n");
     vm_init();
-    acpi_init();
 
     panic("end of kernel reached\n");
     for (;;);