diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-29 00:17:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-29 00:17:24 -0700 |
| commit | fb86819b395486c8c53bb2c8432b3b6b6f5e0e3b (patch) | |
| tree | 2bcc3ad68829e352261b63f49a4afa14cbcdf89d /src/core/hle/kernel/kernel.cpp | |
| parent | 34f281a583c8a569c86ca1e723a79c5d230d17e8 (diff) | |
| parent | 639baf88f71ac8b49622ad6982ba2af50a3214ea (diff) | |
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.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 7ca2a2ef1b..0ffb78d51d 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -620,7 +620,8 @@ struct KernelCore::Impl { void InitializePageSlab() { // Allocate slab heaps - user_slab_heap_pages = std::make_unique<KSlabHeap<Page>>(); + user_slab_heap_pages = + std::make_unique<KSlabHeap<Page>>(KSlabHeap<Page>::AllocationType::Guest); // TODO(ameerj): This should be derived, not hardcoded within the kernel constexpr u64 user_slab_heap_size{0x3de000}; |