diff options
| author | 2015-08-22 14:01:57 -0700 | |
|---|---|---|
| committer | 2015-08-22 14:01:57 -0700 | |
| commit | 3efb205a68d38fe377b2c27349d91ec4c6a2d390 (patch) | |
| tree | 4326d8394e66fec3831ce6b9851da689e5aa78e8 /src/core/system.cpp | |
| parent | Merge pull request #1056 from lioncash/emitter (diff) | |
| parent | Kernel: Remove unused legacy heap MapBlock_* functions (diff) | |
| download | yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.tar.gz yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.tar.xz yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.zip | |
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 @@ | |||
| 4 | 4 | ||
| 5 | #include "core/core.h" | 5 | #include "core/core.h" |
| 6 | #include "core/core_timing.h" | 6 | #include "core/core_timing.h" |
| 7 | #include "core/mem_map.h" | ||
| 8 | #include "core/system.h" | 7 | #include "core/system.h" |
| 9 | #include "core/hw/hw.h" | 8 | #include "core/hw/hw.h" |
| 10 | #include "core/hle/hle.h" | 9 | #include "core/hle/hle.h" |
| 11 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 11 | #include "core/hle/kernel/memory.h" | ||
| 12 | 12 | ||
| 13 | #include "video_core/video_core.h" | 13 | #include "video_core/video_core.h" |
| 14 | 14 | ||
| @@ -29,7 +29,6 @@ void Shutdown() { | |||
| 29 | HLE::Shutdown(); | 29 | HLE::Shutdown(); |
| 30 | Kernel::Shutdown(); | 30 | Kernel::Shutdown(); |
| 31 | HW::Shutdown(); | 31 | HW::Shutdown(); |
| 32 | Memory::Shutdown(); | ||
| 33 | CoreTiming::Shutdown(); | 32 | CoreTiming::Shutdown(); |
| 34 | Core::Shutdown(); | 33 | Core::Shutdown(); |
| 35 | } | 34 | } |