diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-16 17:23:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 17:23:33 -0500 |
| commit | 4f8b6c8c3938b24ec72537fb3549e9e82e944b82 (patch) | |
| tree | 6bf8782b9338d94938e4060c8a3c88855d68ee75 /src/core/hle/kernel/vm_manager.cpp | |
| parent | 50906db096b00e2434ff2ec5a6791747f9b9a811 (diff) | |
| parent | 41bfd994f64da55918dc53463e1dd0324a424ee3 (diff) | |
Merge pull request #47 from MerryMage/build-fixes
Misc build fixes
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 dca637dde0..650d47925c 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; |