summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/vm_manager.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-19 01:02:47 +0200
committerLioncash <mathew1800@gmail.com>2018-07-19 01:34:31 +0200
commit46458e72846f2611f738e41ece6336472f5288d5 (patch)
treedf865f3749a15b3c7079d12d8e66df0fbb7ed05a /src/core/hle/kernel/vm_manager.cpp
parentMerge pull request #681 from lioncash/const (diff)
downloadyuzu-46458e72846f2611f738e41ece6336472f5288d5.tar
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.gz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.bz2
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.lz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.xz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.zst
yuzu-46458e72846f2611f738e41ece6336472f5288d5.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 034dd490e..1cd7f1984 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <iterator>
+#include <utility>
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/arm/arm_interface.h"
@@ -117,7 +118,7 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target,
final_vma.type = VMAType::AllocatedMemoryBlock;
final_vma.permissions = VMAPermission::ReadWrite;
final_vma.meminfo_state = state;
- final_vma.backing_block = block;
+ final_vma.backing_block = std::move(block);
final_vma.offset = offset;
UpdatePageTableForVMA(final_vma);
@@ -160,7 +161,7 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMMIO(VAddr target, PAddr paddr, u6
final_vma.permissions = VMAPermission::ReadWrite;
final_vma.meminfo_state = state;
final_vma.paddr = paddr;
- final_vma.mmio_handler = mmio_handler;
+ final_vma.mmio_handler = std::move(mmio_handler);
UpdatePageTableForVMA(final_vma);
return MakeResult<VMAHandle>(MergeAdjacent(vma_handle));