summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-15 08:21:25 +0100
committerbunnei <bunneidev@gmail.com>2022-01-22 10:33:26 +0100
commit264bb5abf7258a6231f1480f1a3ae1022b9bd391 (patch)
tree1a41424a85183c3630f9f9d35609eb5678670fbb
parentcore: hle: kernel: KPageTable: SetHeapSize: Cleanup & take physical memory lock. (diff)
downloadyuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar.gz
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar.bz2
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar.lz
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar.xz
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.tar.zst
yuzu-264bb5abf7258a6231f1480f1a3ae1022b9bd391.zip
-rw-r--r--src/core/hle/kernel/k_page_table.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp
index 04276ab32..2f8abcbcf 100644
--- a/src/core/hle/kernel/k_page_table.cpp
+++ b/src/core/hle/kernel/k_page_table.cpp
@@ -1178,7 +1178,7 @@ VAddr KPageTable::AllocateVirtualMemory(VAddr start, std::size_t region_num_page
ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, const KPageLinkedList& page_group,
OperationType operation) {
- std::lock_guard lock{page_table_lock};
+ ASSERT(this->IsLockedByCurrentThread());
ASSERT(Common::IsAligned(addr, PageSize));
ASSERT(num_pages > 0);
@@ -1203,7 +1203,7 @@ ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, const KPageLin
ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, KMemoryPermission perm,
OperationType operation, PAddr map_addr) {
- std::lock_guard lock{page_table_lock};
+ ASSERT(this->IsLockedByCurrentThread());
ASSERT(num_pages > 0);
ASSERT(Common::IsAligned(addr, PageSize));