diff options
| author | bunnei <bunneidev@gmail.com> | 2021-08-25 21:00:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 21:00:18 -0700 |
| commit | 98c2f0e57651575c17ac6d2b5db04055abf228ee (patch) | |
| tree | d6f7d065cd8e2f00c85b9749076ef303a705c864 /src/core/hle/kernel/k_address_arbiter.cpp | |
| parent | 3843995ceb3e20c1d32d790f1d81a2a6c3d49c38 (diff) | |
| parent | 0c8594b2251cf600afc3a89ecf1114eb3a25f700 (diff) | |
Merge pull request #6922 from yuzu-emu/revert-6832-scheduler-improvements
Revert "kernel: Various improvements to scheduler"
Diffstat (limited to 'src/core/hle/kernel/k_address_arbiter.cpp')
| -rw-r--r-- | src/core/hle/kernel/k_address_arbiter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index 6771ef621..1b429bc1e 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -28,7 +28,7 @@ bool ReadFromUser(Core::System& system, s32* out, VAddr address) { bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 value) { auto& monitor = system.Monitor(); - const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); + const auto current_core = system.CurrentCoreIndex(); // TODO(bunnei): We should disable interrupts here via KScopedInterruptDisable. // TODO(bunnei): We should call CanAccessAtomic(..) here. @@ -58,7 +58,7 @@ bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 valu bool UpdateIfEqual(Core::System& system, s32* out, VAddr address, s32 value, s32 new_value) { auto& monitor = system.Monitor(); - const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); + const auto current_core = system.CurrentCoreIndex(); // TODO(bunnei): We should disable interrupts here via KScopedInterruptDisable. // TODO(bunnei): We should call CanAccessAtomic(..) here. |