diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-22 14:01:57 -0700 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-22 14:01:57 -0700 |
commit | 3efb205a68d38fe377b2c27349d91ec4c6a2d390 (patch) | |
tree | 4326d8394e66fec3831ce6b9851da689e5aa78e8 /src/core/system.cpp | |
parent | d8908aef6389c83590e5f6fa3a9dc5ea5fe8fced (diff) | |
parent | 840b85690b5de1e7ca89763ff6ca58cbe9b6d68f (diff) |
Merge pull request #1025 from yuriks/heap-management
Kernel: Correct(er) handling of Heap and Linear Heap allocations
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r-- | src/core/system.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 561ff82f0..3cd84bf5e 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -4,11 +4,11 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/mem_map.h" #include "core/system.h" #include "core/hw/hw.h" #include "core/hle/hle.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/memory.h" #include "video_core/video_core.h" @@ -29,7 +29,6 @@ void Shutdown() { HLE::Shutdown(); Kernel::Shutdown(); HW::Shutdown(); - Memory::Shutdown(); CoreTiming::Shutdown(); Core::Shutdown(); } |