diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 98b3ec712..e4de3f3bf 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -31,10 +31,10 @@ | |||
| 31 | #include "core/hle/kernel/k_resource_limit.h" | 31 | #include "core/hle/kernel/k_resource_limit.h" |
| 32 | #include "core/hle/kernel/k_scheduler.h" | 32 | #include "core/hle/kernel/k_scheduler.h" |
| 33 | #include "core/hle/kernel/k_shared_memory.h" | 33 | #include "core/hle/kernel/k_shared_memory.h" |
| 34 | #include "core/hle/kernel/k_slab_heap.h" | ||
| 34 | #include "core/hle/kernel/k_thread.h" | 35 | #include "core/hle/kernel/k_thread.h" |
| 35 | #include "core/hle/kernel/kernel.h" | 36 | #include "core/hle/kernel/kernel.h" |
| 36 | #include "core/hle/kernel/memory/memory_manager.h" | 37 | #include "core/hle/kernel/memory/memory_manager.h" |
| 37 | #include "core/hle/kernel/memory/slab_heap.h" | ||
| 38 | #include "core/hle/kernel/physical_core.h" | 38 | #include "core/hle/kernel/physical_core.h" |
| 39 | #include "core/hle/kernel/process.h" | 39 | #include "core/hle/kernel/process.h" |
| 40 | #include "core/hle/kernel/service_thread.h" | 40 | #include "core/hle/kernel/service_thread.h" |
| @@ -306,7 +306,7 @@ struct KernelCore::Impl { | |||
| 306 | Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory"); | 306 | Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory"); |
| 307 | 307 | ||
| 308 | // Allocate slab heaps | 308 | // Allocate slab heaps |
| 309 | user_slab_heap_pages = std::make_unique<Memory::SlabHeap<Memory::Page>>(); | 309 | user_slab_heap_pages = std::make_unique<KSlabHeap<Memory::Page>>(); |
| 310 | 310 | ||
| 311 | constexpr u64 user_slab_heap_size{0x1ef000}; | 311 | constexpr u64 user_slab_heap_size{0x1ef000}; |
| 312 | // Reserve slab heaps | 312 | // Reserve slab heaps |
| @@ -349,7 +349,7 @@ struct KernelCore::Impl { | |||
| 349 | 349 | ||
| 350 | // Kernel memory management | 350 | // Kernel memory management |
| 351 | std::unique_ptr<Memory::MemoryManager> memory_manager; | 351 | std::unique_ptr<Memory::MemoryManager> memory_manager; |
| 352 | std::unique_ptr<Memory::SlabHeap<Memory::Page>> user_slab_heap_pages; | 352 | std::unique_ptr<KSlabHeap<Memory::Page>> user_slab_heap_pages; |
| 353 | 353 | ||
| 354 | // Shared memory for services | 354 | // Shared memory for services |
| 355 | std::shared_ptr<Kernel::KSharedMemory> hid_shared_mem; | 355 | std::shared_ptr<Kernel::KSharedMemory> hid_shared_mem; |
| @@ -581,11 +581,11 @@ const Memory::MemoryManager& KernelCore::MemoryManager() const { | |||
| 581 | return *impl->memory_manager; | 581 | return *impl->memory_manager; |
| 582 | } | 582 | } |
| 583 | 583 | ||
| 584 | Memory::SlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() { | 584 | KSlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() { |
| 585 | return *impl->user_slab_heap_pages; | 585 | return *impl->user_slab_heap_pages; |
| 586 | } | 586 | } |
| 587 | 587 | ||
| 588 | const Memory::SlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() const { | 588 | const KSlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() const { |
| 589 | return *impl->user_slab_heap_pages; | 589 | return *impl->user_slab_heap_pages; |
| 590 | } | 590 | } |
| 591 | 591 | ||