early-access version 2667

src/core/hle/kernel/k_thread.h

@@ -15,6 +15,7 @@
 
 #include "common/common_types.h"
 #include "common/intrusive_red_black_tree.h"
+#include "common/spin_lock.h"
 #include "core/arm/arm_interface.h"
 #include "core/hle/kernel/k_affinity_mask.h"
 #include "core/hle/kernel/k_light_lock.h"
@@ -637,14 +638,6 @@ public:
         return condvar_key;
     }
 
-    // Dummy threads (used for HLE host threads) cannot wait based on the guest scheduler, and
-    // therefore will not block on guest kernel synchronization primitives. These methods handle
-    // blocking as needed.
-
-    void IfDummyThreadTryWait();
-    void IfDummyThreadBeginWait();
-    void IfDummyThreadEndWait();
-
 private:
     static constexpr size_t PriorityInheritanceCountMax = 10;
     union SyncObjectBuffer {
@@ -762,7 +755,7 @@ private:
     s8 priority_inheritance_count{};
     bool resource_limit_release_hint{};
     StackParameters stack_parameters{};
-    KSpinLock context_guard{};
+    Common::SpinLock context_guard{};
     KSpinLock dummy_wait_lock{};
 
     // For emulation