diff options
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/lock.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/lock.h | 2 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/lock.cpp b/src/core/hle/lock.cpp index 082f689c8..1c24c7ce9 100644 --- a/src/core/hle/lock.cpp +++ b/src/core/hle/lock.cpp | |||
| @@ -7,5 +7,5 @@ | |||
| 7 | #include <core/hle/lock.h> | 7 | #include <core/hle/lock.h> |
| 8 | 8 | ||
| 9 | namespace HLE { | 9 | namespace HLE { |
| 10 | std::mutex g_hle_lock; | 10 | std::recursive_mutex g_hle_lock; |
| 11 | } | 11 | } |
diff --git a/src/core/hle/lock.h b/src/core/hle/lock.h index 8265621e1..5c99fe996 100644 --- a/src/core/hle/lock.h +++ b/src/core/hle/lock.h | |||
| @@ -14,5 +14,5 @@ namespace HLE { | |||
| 14 | * to the emulated memory is not protected by this mutex, and should be avoided in any threads other | 14 | * to the emulated memory is not protected by this mutex, and should be avoided in any threads other |
| 15 | * than the CPU thread. | 15 | * than the CPU thread. |
| 16 | */ | 16 | */ |
| 17 | extern std::mutex g_hle_lock; | 17 | extern std::recursive_mutex g_hle_lock; |
| 18 | } // namespace HLE | 18 | } // namespace HLE |
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index b98938cb4..dfc36748c 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -1334,7 +1334,7 @@ void CallSVC(u32 immediate) { | |||
| 1334 | MICROPROFILE_SCOPE(Kernel_SVC); | 1334 | MICROPROFILE_SCOPE(Kernel_SVC); |
| 1335 | 1335 | ||
| 1336 | // Lock the global kernel mutex when we enter the kernel HLE. | 1336 | // Lock the global kernel mutex when we enter the kernel HLE. |
| 1337 | std::lock_guard<std::mutex> lock(HLE::g_hle_lock); | 1337 | std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); |
| 1338 | 1338 | ||
| 1339 | const FunctionDef* info = GetSVCInfo(immediate); | 1339 | const FunctionDef* info = GetSVCInfo(immediate); |
| 1340 | if (info) { | 1340 | if (info) { |