diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-10-19 22:27:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-19 22:27:43 +0200 |
commit | 560bca57a203c45acb1c589699b472223e8b68fd (patch) | |
tree | 98ef4a0d62a368614075463d13c4220b11af9760 /src/core/hle/kernel/init/init_slab_setup.cpp | |
parent | Merge pull request #9084 from vonchenplus/dma_copy (diff) | |
parent | core: hle: kernel: Migrate ProcessState to enum class. (diff) | |
download | yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.gz yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.bz2 yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.lz yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.xz yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.zst yuzu-560bca57a203c45acb1c589699b472223e8b68fd.zip |
Diffstat (limited to 'src/core/hle/kernel/init/init_slab_setup.cpp')
-rw-r--r-- | src/core/hle/kernel/init/init_slab_setup.cpp | 6 |
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 // TODO(bunnei): Fix this once we support the kernel virtual memory layout. if (size > 0) { - void* backing_kernel_memory{ - system.DeviceMemory().GetPointer(TranslateSlabAddrToPhysical(memory_layout, start))}; + void* backing_kernel_memory{system.DeviceMemory().GetPointer<void>( + TranslateSlabAddrToPhysical(memory_layout, start))}; const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1); ASSERT(region != nullptr); @@ -181,7 +181,7 @@ void InitializeKPageBufferSlabHeap(Core::System& system) { ASSERT(slab_address != 0); // Initialize the slabheap. - KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer(slab_address), + KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer<void>(slab_address), slab_size); } |