From 33052eee898c84f5becfdc34f5a79faf0bd13106 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Tue, 22 Apr 2025 19:50:10 +0200 Subject: dev, boot: fix bootloader link error caused by `kTeams` Signed-off-by: Amlal El Mahrouss --- dev/kernel/HALKit/AMD64/HalKernelMain.cc | 4 +++- dev/kernel/KernelKit/UserProcessScheduler.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'dev') diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 60d05e11..5c50b3e3 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -21,6 +21,8 @@ EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; EXTERN_C Kernel::VoidPtr mp_user_switch_proc; EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; +STATIC Kernel::Array kTeams; + STATIC Kernel::Void hal_pre_init_scheduler() { for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) @@ -111,7 +113,7 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept UserProcessScheduler::The().SwitchTeam(kTeams[i]); ++i; - + if (i > kSchedTeamCount) { i = 0U; diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h index d8c1dff8..25ff20e5 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.h +++ b/dev/kernel/KernelKit/UserProcessScheduler.h @@ -374,10 +374,6 @@ namespace Kernel }; const UInt32& sched_get_exit_code(void) noexcept; - - inline Kernel::Array - kTeams; } // namespace Kernel #include -- cgit v1.2.3