diff options
author | James Rowe <jroweboy@gmail.com> | 2019-02-15 19:52:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-15 19:52:11 -0700 |
commit | 99da6362c43a24c608a2790f668f10a62e3b80a6 (patch) | |
tree | 6257ac07283ebb4ea5ac622784cc7a041d48f8b1 /src/core/hle/kernel/scheduler.cpp | |
parent | 4327f430f1a4bb33024c13592f229db27bc884b0 (diff) | |
parent | bd983414f643b734a1f8bebe3183723733344f72 (diff) |
Merge pull request #2123 from lioncash/coretiming-global
core_timing: De-globalize core_timing facilities
Diffstat (limited to 'src/core/hle/kernel/scheduler.cpp')
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 9e2517e1b6..44f30d0704 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -111,7 +111,7 @@ void Scheduler::SwitchContext(Thread* new_thread) { void Scheduler::UpdateLastContextSwitchTime(Thread* thread, Process* process) { const u64 prev_switch_ticks = last_context_switch_time; - const u64 most_recent_switch_ticks = Core::Timing::GetTicks(); + const u64 most_recent_switch_ticks = Core::System::GetInstance().CoreTiming().GetTicks(); const u64 update_ticks = most_recent_switch_ticks - prev_switch_ticks; if (thread != nullptr) { |