diff options
| author | Liam <byteslice@airmail.cc> | 2023-01-26 23:43:37 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2023-01-26 23:43:37 +0100 |
| commit | e9e1e7aa3a1e7cb28acc5b82249740dded7b4615 (patch) | |
| tree | 6b0fd0ba833601d405256c267ccea7bad46a22a9 /src/core/hle/kernel | |
| parent | Merge pull request #9683 from german77/high_power_joycon (diff) | |
| download | yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar.gz yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar.bz2 yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar.lz yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar.xz yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.tar.zst yuzu-e9e1e7aa3a1e7cb28acc5b82249740dded7b4615.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 |
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 fbd28f5f3..2e13d5d0d 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -2144,8 +2144,8 @@ void KPageTable::RemapPageGroup(PageLinkedList* page_list, KProcessAddress addre const KMemoryInfo info = it->GetMemoryInfo(); // Determine the range to map. - KProcessAddress map_address = std::max(info.GetAddress(), start_address); - const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address); + KProcessAddress map_address = std::max<VAddr>(info.GetAddress(), start_address); + const KProcessAddress map_end_address = std::min<VAddr>(info.GetEndAddress(), end_address); ASSERT(map_end_address != map_address); // Determine if we should disable head merge. |