From b7a1a3518094fbe4089490e9033bf175942512db Mon Sep 17 00:00:00 2001 From: Kevin Alavik Date: Fri, 30 May 2025 15:14:21 +0200 Subject: [PATCH] fix/kernel: Fixed spelling mistakes --- kernel/src/arch/smp.c | 10 ++++++++++ kernel/src/emk.c | 13 +++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/kernel/src/arch/smp.c b/kernel/src/arch/smp.c index 6f35a7d..88f1234 100644 --- a/kernel/src/arch/smp.c +++ b/kernel/src/arch/smp.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include #define MAX_CPUS 256 #define MSR_GS_BASE 0xC0000101 @@ -76,6 +78,14 @@ void smp_init(void) { set_cpu_local(&cpu_locals[i]); log_early("CPU %u is the bootstrap processor", i); + + /* Disable legacy PIC to prepare for APIC */ + outb(0x21, 0xff); + outb(0xA1, 0xff); + + /* Setup APIC */ + lapic_init(); + atomic_fetch_add(&started_cpus, 1); cpu_locals[i].ready = true; } diff --git a/kernel/src/emk.c b/kernel/src/emk.c index f9ebacd..5ca59e2 100644 --- a/kernel/src/emk.c +++ b/kernel/src/emk.c @@ -87,7 +87,7 @@ void emk_entry(void) /* Just do nothing */ } - log_early("Experimental Micro Kernel (EMK) 1.0 Copytright (c) 2025 Piraterna"); + log_early("Experimental Micro Kernel (EMK) 1.0 Copyright (c) 2025 Piraterna"); log_early("Compiled at %s %s, emk1.0-%s, flanterm support: %s", __TIME__, __DATE__, BUILD_MODE, FLANTERM_SUPPORT ? "yes" : "no"); log_early("%s", LOG_SEPARATOR); @@ -166,9 +166,6 @@ void emk_entry(void) kpanic(NULL, "Failed to get MP request"); } - mp_response = mp_request.response; - smp_init(); - /* Setup ACPI */ rsdp_response = rsdp_request.response; if (!rsdp_response) @@ -178,12 +175,8 @@ void emk_entry(void) acpi_init(); madt_init(); // Also init MADT, to prepare for APIC - /* Disable legacy PIC to prepare for APIC */ - outb(0x21, 0xff); - outb(0xA1, 0xff); - - /* Setup APIC */ - lapic_init(); + mp_response = mp_request.response; + smp_init(); /* Finished */ log_early("%s", LOG_SEPARATOR);