From 6d8bdb808a901520cbe4172cf0a3e3dacfb304b1 Mon Sep 17 00:00:00 2001 From: Stephen Miller Date: Tue, 15 Jul 2025 05:22:44 -0500 Subject: [PATCH] Slight cleanup Don't need `post_merge_it` anymore. --- src/core/memory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/memory.cpp b/src/core/memory.cpp index ae809ddad..12099ea73 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -555,7 +555,8 @@ u64 MemoryManager::UnmapBytesFromEntry(VAddr virtual_addr, VirtualMemoryArea vma vma.phys_base = 0; vma.disallow_merge = false; vma.name = ""; - const auto post_merge_it = MergeAdjacent(vma_map, new_it); + MergeAdjacent(vma_map, new_it); + if (type != VMAType::Reserved && type != VMAType::PoolReserved) { // If this mapping has GPU access, unmap from GPU. if (IsValidGpuMapping(virtual_addr, size)) {