summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-07-06 21:25:27 -0400
committerGravatar GitHub2019-07-06 21:25:27 -0400
commitfb9124b6cdc7366c1dc8c37523e7ff6aad783a23 (patch)
tree8263269934f2393f66725263b7f3a38c53955ae5 /src/core/memory.cpp
parentMerge pull request #2684 from SciresM/suspend_tick (diff)
parentmemory: Remove unused includes (diff)
downloadyuzu-fb9124b6cdc7366c1dc8c37523e7ff6aad783a23.tar.gz
yuzu-fb9124b6cdc7366c1dc8c37523e7ff6aad783a23.tar.xz
yuzu-fb9124b6cdc7366c1dc8c37523e7ff6aad783a23.zip
Merge pull request #2677 from lioncash/assert
kernel/vm_manager: Handle stack/TLS IO region placement a little better
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index f18f6226b..8555691c0 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -16,11 +16,9 @@
16#include "core/core.h" 16#include "core/core.h"
17#include "core/hle/kernel/process.h" 17#include "core/hle/kernel/process.h"
18#include "core/hle/kernel/vm_manager.h" 18#include "core/hle/kernel/vm_manager.h"
19#include "core/hle/lock.h"
20#include "core/memory.h" 19#include "core/memory.h"
21#include "core/memory_setup.h" 20#include "core/memory_setup.h"
22#include "video_core/gpu.h" 21#include "video_core/gpu.h"
23#include "video_core/renderer_base.h"
24 22
25namespace Memory { 23namespace Memory {
26 24