summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2019-07-06 21:25:27 -0400
committerGitHub <noreply@github.com>2019-07-06 21:25:27 -0400
commitfb9124b6cdc7366c1dc8c37523e7ff6aad783a23 (patch)
tree8263269934f2393f66725263b7f3a38c53955ae5 /src/core/memory.cpp
parentf732cd5a4bc47461069ac21c00a833172bcc7d79 (diff)
parent65c748fbd36467334a540a81ebd84767eec38d16 (diff)
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 @@
#include "core/core.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/vm_manager.h"
-#include "core/hle/lock.h"
#include "core/memory.h"
#include "core/memory_setup.h"
#include "video_core/gpu.h"
-#include "video_core/renderer_base.h"
namespace Memory {