summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-07 00:30:37 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:35:30 +0200
commit19847d4d42e061a24086fe90d62382a1ff198322 (patch)
tree5789d2e2fd13acb59e0ba5c969968ab352063380 /src/core/hle/kernel
parentCore: Correct rebase. (diff)
downloadyuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.gz
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.bz2
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.lz
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.xz
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.tar.zst
yuzu-19847d4d42e061a24086fe90d62382a1ff198322.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/scheduler.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index ae89e908f..4e2a5adf3 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -606,10 +606,8 @@ void Scheduler::SwitchContextStep2() {
auto& cpu_core = system.ArmInterface(core_id);
new_thread->context_guard.lock();
cpu_core.Lock();
- ASSERT_MSG(new_thread->GetProcessorID() == s32(this->core_id),
- "Thread must be assigned to this core.");
- ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready,
- "Thread must be ready to become running.");
+ ASSERT_MSG(new_thread->GetSchedulingStatus() == ThreadSchedStatus::Runnable,
+ "Thread must be runnable.");
// Cancel any outstanding wakeup events for this thread
new_thread->SetIsRunning(true);