diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 7307cf262..10e1f47f6 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -75,7 +75,6 @@ struct KernelCore::Impl { | |||
| 75 | InitializeSystemResourceLimit(kernel, system.CoreTiming()); | 75 | InitializeSystemResourceLimit(kernel, system.CoreTiming()); |
| 76 | InitializeMemoryLayout(); | 76 | InitializeMemoryLayout(); |
| 77 | Init::InitializeKPageBufferSlabHeap(system); | 77 | Init::InitializeKPageBufferSlabHeap(system); |
| 78 | InitializeSchedulers(); | ||
| 79 | InitializeShutdownThreads(); | 78 | InitializeShutdownThreads(); |
| 80 | InitializePreemption(kernel); | 79 | InitializePreemption(kernel); |
| 81 | 80 | ||
| @@ -148,7 +147,6 @@ struct KernelCore::Impl { | |||
| 148 | shutdown_threads[core_id] = nullptr; | 147 | shutdown_threads[core_id] = nullptr; |
| 149 | } | 148 | } |
| 150 | 149 | ||
| 151 | schedulers[core_id]->Finalize(); | ||
| 152 | schedulers[core_id].reset(); | 150 | schedulers[core_id].reset(); |
| 153 | } | 151 | } |
| 154 | 152 | ||
| @@ -195,17 +193,11 @@ struct KernelCore::Impl { | |||
| 195 | exclusive_monitor = | 193 | exclusive_monitor = |
| 196 | Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); | 194 | Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); |
| 197 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | 195 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { |
| 198 | schedulers[i] = std::make_unique<Kernel::KScheduler>(system, i); | 196 | schedulers[i] = std::make_unique<Kernel::KScheduler>(system.Kernel()); |
| 199 | cores.emplace_back(i, system, *schedulers[i], interrupts); | 197 | cores.emplace_back(i, system, *schedulers[i], interrupts); |
| 200 | } | 198 | } |
| 201 | } | 199 | } |
| 202 | 200 | ||
| 203 | void InitializeSchedulers() { | ||
| 204 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | ||
| 205 | cores[i].Scheduler().Initialize(); | ||
| 206 | } | ||
| 207 | } | ||
| 208 | |||
| 209 | // Creates the default system resource limit | 201 | // Creates the default system resource limit |
| 210 | void InitializeSystemResourceLimit(KernelCore& kernel, | 202 | void InitializeSystemResourceLimit(KernelCore& kernel, |
| 211 | const Core::Timing::CoreTiming& core_timing) { | 203 | const Core::Timing::CoreTiming& core_timing) { |