From bad677be5b07c81b5936ded6590a8891b9d64386 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 4 Aug 2022 17:04:40 -0400 Subject: [PATCH] kernel/scheduler: Remove "inline" attribute from PeekThread. This will allow it to be invoked outside scheduler_cpu.cpp, and GCC should automatically inline this function within that file anyway. No functional change intended. --- src/system/kernel/scheduler/scheduler_cpu.cpp | 4 ++-- src/system/kernel/scheduler/scheduler_cpu.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/scheduler/scheduler_cpu.cpp b/src/system/kernel/scheduler/scheduler_cpu.cpp index 6b33db2162..67cae7dcee 100644 --- a/src/system/kernel/scheduler/scheduler_cpu.cpp +++ b/src/system/kernel/scheduler/scheduler_cpu.cpp @@ -152,7 +152,7 @@ CPUEntry::Remove(ThreadData* thread) } -inline ThreadData* +ThreadData* CoreEntry::PeekThread() const { SCHEDULER_ENTER_FUNCTION(); @@ -160,7 +160,7 @@ CoreEntry::PeekThread() const } -inline ThreadData* +ThreadData* CPUEntry::PeekThread() const { SCHEDULER_ENTER_FUNCTION(); diff --git a/src/system/kernel/scheduler/scheduler_cpu.h b/src/system/kernel/scheduler/scheduler_cpu.h index af949b53a6..54102766a7 100644 --- a/src/system/kernel/scheduler/scheduler_cpu.h +++ b/src/system/kernel/scheduler/scheduler_cpu.h @@ -68,7 +68,7 @@ public: void PushBack(ThreadData* thread, int32 priority); void Remove(ThreadData* thread); - inline ThreadData* PeekThread() const; + ThreadData* PeekThread() const; ThreadData* PeekIdleThread() const; void UpdatePriority(int32 priority); @@ -147,7 +147,7 @@ public: void PushBack(ThreadData* thread, int32 priority); void Remove(ThreadData* thread); - inline ThreadData* PeekThread() const; + ThreadData* PeekThread() const; inline bigtime_t GetActiveTime() const; inline void IncreaseActiveTime(