diff options
author | danzel <danzel@localhost.geek.nz> | 2017-08-29 10:39:55 +0200 |
---|---|---|
committer | danzel <danzel@localhost.geek.nz> | 2017-08-29 10:39:55 +0200 |
commit | 826606479682234c98e4dfa6e616e637a28d4fcc (patch) | |
tree | be6cbcc451182e0ec9801470b9c454e94ba124c5 /src/core/memory.cpp | |
parent | Merge pull request #2839 from Subv/global_kernel_lock (diff) | |
download | yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.gz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.bz2 yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.lz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.xz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.zst yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/memory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index a3c5f4a9d..097bc5b47 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -183,7 +183,7 @@ T Read(const VAddr vaddr) { } // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state - std::lock_guard<std::mutex> lock(HLE::g_hle_lock); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { @@ -224,7 +224,7 @@ void Write(const VAddr vaddr, const T data) { } // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state - std::lock_guard<std::mutex> lock(HLE::g_hle_lock); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { |