summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-04-08 01:01:26 +0200
committerbunnei <bunneidev@gmail.com>2022-04-12 06:13:40 +0200
commit8deaac8bd1707f56f29d61e427ad53964a0920fd (patch)
treed17e4ed20b9249507ad587aa0eb82e277daff614 /src/core/hle/service
parentMerge pull request #8157 from lat9nq/kernel-races (diff)
downloadyuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.gz
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.bz2
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.lz
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.xz
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.zst
yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/service.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index c78b2baeb..148265218 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -9,7 +9,6 @@
#include <string>
#include <boost/container/flat_map.hpp>
#include "common/common_types.h"
-#include "common/spin_lock.h"
#include "core/hle/kernel/hle_ipc.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -90,7 +89,7 @@ protected:
using HandlerFnP = void (Self::*)(Kernel::HLERequestContext&);
/// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.
- [[nodiscard]] std::scoped_lock<Common::SpinLock> LockService() {
+ [[nodiscard]] std::scoped_lock<std::mutex> LockService() {
return std::scoped_lock{lock_service};
}
@@ -135,7 +134,7 @@ private:
boost::container::flat_map<u32, FunctionInfoBase> handlers_tipc;
/// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.
- Common::SpinLock lock_service;
+ std::mutex lock_service;
};
/**