SVC: Correct races on physical core switching.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 279fe5888..1e6c60d78 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -2454,11 +2454,6 @@ void Call(Core::System& system, u32 immediate) {
     MICROPROFILE_SCOPE(Kernel_SVC);
 
     auto& physical_core = system.CurrentPhysicalCore();
-    if (physical_core.IsInterrupted()) {
-        auto& sched = physical_core.Scheduler();
-        sched.TryDoContextSwitch();
-    }
-    physical_core.ClearExclusive();
 
     const FunctionDef* info = system.CurrentProcess()->Is64BitProcess() ? GetSVCInfo64(immediate)
                                                                         : GetSVCInfo32(immediate);
@@ -2471,6 +2466,10 @@ void Call(Core::System& system, u32 immediate) {
     } else {
         LOG_CRITICAL(Kernel_SVC, "Unknown SVC function 0x{:X}", immediate);
     }
+    auto& physical_core_2 = system.CurrentPhysicalCore();
+    if (physical_core.CoreIndex() != physical_core_2.CoreIndex()) {
+        physical_core.Stop();
+    }
 }
 
 } // namespace Kernel::Svc