summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar Brian Clinkenbeard2020-02-12 16:07:07 -0800
committerGravatar Brian Clinkenbeard2020-02-12 16:07:07 -0800
commit0d85b6bfe17541ea64d51ebe755a4c6120687005 (patch)
tree7042d6646778f08f13b8cd4cdb950769f322ae71 /src/core/hle/kernel/thread.cpp
parentuse config mode for finding SDL2 with CMake (diff)
parentMerge pull request #3403 from lioncash/debug (diff)
downloadyuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.gz
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.xz
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.zip
Merge branch 'master' into fix-cmake-sdl2
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index e965b5b04..ad464e03b 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -474,7 +474,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) {
474 if (GetSchedulingStatus() != ThreadSchedStatus::Runnable) { 474 if (GetSchedulingStatus() != ThreadSchedStatus::Runnable) {
475 return; 475 return;
476 } 476 }
477 auto& scheduler = Core::System::GetInstance().GlobalScheduler(); 477 auto& scheduler = kernel.GlobalScheduler();
478 if (processor_id >= 0) { 478 if (processor_id >= 0) {
479 scheduler.Unschedule(old_priority, static_cast<u32>(processor_id), this); 479 scheduler.Unschedule(old_priority, static_cast<u32>(processor_id), this);
480 } 480 }
@@ -506,7 +506,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) {
506} 506}
507 507
508void Thread::AdjustSchedulingOnAffinity(u64 old_affinity_mask, s32 old_core) { 508void Thread::AdjustSchedulingOnAffinity(u64 old_affinity_mask, s32 old_core) {
509 auto& scheduler = Core::System::GetInstance().GlobalScheduler(); 509 auto& scheduler = kernel.GlobalScheduler();
510 if (GetSchedulingStatus() != ThreadSchedStatus::Runnable || 510 if (GetSchedulingStatus() != ThreadSchedStatus::Runnable ||
511 current_priority >= THREADPRIO_COUNT) { 511 current_priority >= THREADPRIO_COUNT) {
512 return; 512 return;