diff options
| author | 2018-08-03 14:07:49 -0400 | |
|---|---|---|
| committer | 2018-08-03 14:07:49 -0400 | |
| commit | 40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94 (patch) | |
| tree | 1d81b94e3bdcce384aaa892c1d92a48d725680cf /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #909 from lioncash/const (diff) | |
| parent | core/memory: Get rid of 3DS leftovers (diff) | |
| download | yuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.tar.gz yuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.tar.xz yuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.zip | |
Merge pull request #908 from lioncash/memory
core/memory: Get rid of 3DS leftovers
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 3eb4f465c..1b0cd0abf 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | #include "core/hle/kernel/handle_table.h" | 5 | #include "core/hle/kernel/handle_table.h" |
| 6 | #include "core/hle/kernel/kernel.h" | 6 | #include "core/hle/kernel/kernel.h" |
| 7 | #include "core/hle/kernel/memory.h" | ||
| 8 | #include "core/hle/kernel/process.h" | 7 | #include "core/hle/kernel/process.h" |
| 9 | #include "core/hle/kernel/resource_limit.h" | 8 | #include "core/hle/kernel/resource_limit.h" |
| 10 | #include "core/hle/kernel/thread.h" | 9 | #include "core/hle/kernel/thread.h" |
| @@ -15,9 +14,7 @@ namespace Kernel { | |||
| 15 | unsigned int Object::next_object_id; | 14 | unsigned int Object::next_object_id; |
| 16 | 15 | ||
| 17 | /// Initialize the kernel | 16 | /// Initialize the kernel |
| 18 | void Init(u32 system_mode) { | 17 | void Init() { |
| 19 | Kernel::MemoryInit(system_mode); | ||
| 20 | |||
| 21 | Kernel::ResourceLimitsInit(); | 18 | Kernel::ResourceLimitsInit(); |
| 22 | Kernel::ThreadingInit(); | 19 | Kernel::ThreadingInit(); |
| 23 | Kernel::TimersInit(); | 20 | Kernel::TimersInit(); |
| @@ -37,7 +34,6 @@ void Shutdown() { | |||
| 37 | 34 | ||
| 38 | Kernel::TimersShutdown(); | 35 | Kernel::TimersShutdown(); |
| 39 | Kernel::ResourceLimitsShutdown(); | 36 | Kernel::ResourceLimitsShutdown(); |
| 40 | Kernel::MemoryShutdown(); | ||
| 41 | } | 37 | } |
| 42 | 38 | ||
| 43 | } // namespace Kernel | 39 | } // namespace Kernel |