summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2021-05-29 00:17:24 -0700
committerGravatar GitHub2021-05-29 00:17:24 -0700
commit5388e6db840b32fac1cb70bd490a383c01cf7cd1 (patch)
tree2bcc3ad68829e352261b63f49a4afa14cbcdf89d /src/core/hle/kernel/kernel.cpp
parentMerge pull request #6383 from degasus/fix_gcc_warnings (diff)
parenthle: kernel: KSlabHeap: Allow host or guest allocations. (diff)
downloadyuzu-5388e6db840b32fac1cb70bd490a383c01cf7cd1.tar.gz
yuzu-5388e6db840b32fac1cb70bd490a383c01cf7cd1.tar.xz
yuzu-5388e6db840b32fac1cb70bd490a383c01cf7cd1.zip
Merge pull request #6373 from bunnei/use-slabheap-tls
hle: kernel: KSlabHeap: Allow host or guest allocations.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 7ca2a2ef1..0ffb78d51 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -620,7 +620,8 @@ struct KernelCore::Impl {
620 620
621 void InitializePageSlab() { 621 void InitializePageSlab() {
622 // Allocate slab heaps 622 // Allocate slab heaps
623 user_slab_heap_pages = std::make_unique<KSlabHeap<Page>>(); 623 user_slab_heap_pages =
624 std::make_unique<KSlabHeap<Page>>(KSlabHeap<Page>::AllocationType::Guest);
624 625
625 // TODO(ameerj): This should be derived, not hardcoded within the kernel 626 // TODO(ameerj): This should be derived, not hardcoded within the kernel
626 constexpr u64 user_slab_heap_size{0x3de000}; 627 constexpr u64 user_slab_heap_size{0x3de000};