summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/init
diff options
context:
space:
mode:
authorGravatar liamwhite2022-10-19 16:27:43 -0400
committerGravatar GitHub2022-10-19 16:27:43 -0400
commit560bca57a203c45acb1c589699b472223e8b68fd (patch)
tree98ef4a0d62a368614075463d13c4220b11af9760 /src/core/hle/kernel/init
parentMerge pull request #9084 from vonchenplus/dma_copy (diff)
parentcore: hle: kernel: Migrate ProcessState to enum class. (diff)
downloadyuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.gz
yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.xz
yuzu-560bca57a203c45acb1c589699b472223e8b68fd.zip
Merge pull request #9071 from bunnei/mp-mm
Kernel Multiprocess (Part 1) - Persist memory & core timing
Diffstat (limited to 'src/core/hle/kernel/init')
-rw-r--r--src/core/hle/kernel/init/init_slab_setup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp
index 9b6b284d0..c84d36c8c 100644
--- a/src/core/hle/kernel/init/init_slab_setup.cpp
+++ b/src/core/hle/kernel/init/init_slab_setup.cpp
@@ -94,8 +94,8 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd
94 // TODO(bunnei): Fix this once we support the kernel virtual memory layout. 94 // TODO(bunnei): Fix this once we support the kernel virtual memory layout.
95 95
96 if (size > 0) { 96 if (size > 0) {
97 void* backing_kernel_memory{ 97 void* backing_kernel_memory{system.DeviceMemory().GetPointer<void>(
98 system.DeviceMemory().GetPointer(TranslateSlabAddrToPhysical(memory_layout, start))}; 98 TranslateSlabAddrToPhysical(memory_layout, start))};
99 99
100 const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1); 100 const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1);
101 ASSERT(region != nullptr); 101 ASSERT(region != nullptr);
@@ -181,7 +181,7 @@ void InitializeKPageBufferSlabHeap(Core::System& system) {
181 ASSERT(slab_address != 0); 181 ASSERT(slab_address != 0);
182 182
183 // Initialize the slabheap. 183 // Initialize the slabheap.
184 KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer(slab_address), 184 KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer<void>(slab_address),
185 slab_size); 185 slab_size);
186} 186}
187 187