diff options
| author | 2022-02-26 01:41:08 -0800 | |
|---|---|---|
| committer | 2022-02-26 01:41:08 -0800 | |
| commit | 20e9501b0d0d18b6b215f2f3ed092a3646267bd1 (patch) | |
| tree | cd90b946482d00c5431c13b165f28d803cf54f59 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #7953 from ameerj/radv-rdna2-crash (diff) | |
| parent | hle: kernel: KSystemControl: Use 6GB memory layout when "use_extended_memory_... (diff) | |
| download | yuzu-20e9501b0d0d18b6b215f2f3ed092a3646267bd1.tar.gz yuzu-20e9501b0d0d18b6b215f2f3ed092a3646267bd1.tar.xz yuzu-20e9501b0d0d18b6b215f2f3ed092a3646267bd1.zip | |
Merge pull request #7932 from bunnei/extended-mem-layout
Add extended memory layout (6GB) support and improve KResourceLimit management
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 49c0714ed..797f47021 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -240,13 +240,6 @@ struct KernelCore::Impl { | |||
| 240 | constexpr u64 secure_applet_memory_size{4_MiB}; | 240 | constexpr u64 secure_applet_memory_size{4_MiB}; |
| 241 | ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemory, | 241 | ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemory, |
| 242 | secure_applet_memory_size)); | 242 | secure_applet_memory_size)); |
| 243 | |||
| 244 | // This memory seems to be reserved on hardware, but is not reserved/used by yuzu. | ||
| 245 | // Likely Horizon OS reserved memory | ||
| 246 | // TODO(ameerj): Derive the memory rather than hardcode it. | ||
| 247 | constexpr u64 unknown_reserved_memory{0x2f896000}; | ||
| 248 | ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemory, | ||
| 249 | unknown_reserved_memory)); | ||
| 250 | } | 243 | } |
| 251 | 244 | ||
| 252 | void InitializePreemption(KernelCore& kernel) { | 245 | void InitializePreemption(KernelCore& kernel) { |