summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-11-14 17:53:02 +0100
committerLiam <byteslice@airmail.cc>2023-11-14 17:53:02 +0100
commitb30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65 (patch)
tree16f6e5ecf3458769d43275bac417cbad840594a2
parentMerge pull request #11990 from german77/audio (diff)
downloadyuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar.gz
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar.bz2
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar.lz
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar.xz
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.tar.zst
yuzu-b30e19ba24ae729f6bd74fb9e1dc79bdcafa1f65.zip
-rw-r--r--src/core/hle/kernel/k_page_table_base.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/core/hle/kernel/k_page_table_base.cpp
index 6a57ad55c..47dc8fd35 100644
--- a/src/core/hle/kernel/k_page_table_base.cpp
+++ b/src/core/hle/kernel/k_page_table_base.cpp
@@ -1617,9 +1617,9 @@ void KPageTableBase::RemapPageGroup(PageLinkedList* page_list, KProcessAddress a
const KMemoryInfo info = it->GetMemoryInfo();
// Determine the range to map.
- KProcessAddress map_address = std::max(info.GetAddress(), GetInteger(start_address));
+ KProcessAddress map_address = std::max<u64>(info.GetAddress(), GetInteger(start_address));
const KProcessAddress map_end_address =
- std::min(info.GetEndAddress(), GetInteger(end_address));
+ std::min<u64>(info.GetEndAddress(), GetInteger(end_address));
ASSERT(map_end_address != map_address);
// Determine if we should disable head merge.