diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-16 19:05:21 +0100 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-16 19:05:21 +0100 |
| commit | e35644c00533c797888a23420aae90b07e0da184 (patch) | |
| tree | 4b5464207a2bf8355cd7b2b732fc3c30d3524d24 /src/core/hle/kernel/vm_manager.cpp | |
| parent | travis: Use more recent cmake on macOS (diff) | |
| download | yuzu-e35644c00533c797888a23420aae90b07e0da184.tar yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.gz yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.bz2 yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.lz yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.xz yuzu-e35644c00533c797888a23420aae90b07e0da184.tar.zst yuzu-e35644c00533c797888a23420aae90b07e0da184.zip | |
Diffstat (limited to 'src/core/hle/kernel/vm_manager.cpp')
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 5 |
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 dca637dde..650d47925 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -6,9 +6,9 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/arm/arm_interface.h" +#include "core/core.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/vm_manager.h" -#include "core/core.h" #include "core/memory.h" #include "core/memory_setup.h" #include "core/mmio.h" @@ -86,7 +86,8 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target, VirtualMemoryArea& final_vma = vma_handle->second; ASSERT(final_vma.size == size); - Core::CPU().MapBackingMemory(target, size, block->data() + offset, VMAPermission::ReadWriteExecute); + Core::CPU().MapBackingMemory(target, size, block->data() + offset, + VMAPermission::ReadWriteExecute); final_vma.type = VMAType::AllocatedMemoryBlock; final_vma.permissions = VMAPermission::ReadWrite; |