diff options
| author |  Yuri Kunde Schlesner | 2015-08-27 20:09:43 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-08-27 20:09:43 -0700 |
| commit | bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8 (patch) | |
| tree | f6d8105250ed5a829cbb9348df761ad57fae3ad0 /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #1075 from yuriks/ControlMem-fixes (diff) | |
| parent | Kernel: Fix wrong linear heap base on titles using newer kernels (diff) | |
| download | yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.gz yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.xz yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.zip | |
Merge pull request #1080 from yuriks/linear-heap-base-typo
Kernel: Fix wrong linear heap base on titles using newer kernels
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 6279a4bf8..c2b4963d4 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -129,7 +129,7 @@ void Process::Run(s32 main_thread_priority, u32 stack_size) { | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | VAddr Process::GetLinearHeapBase() const { | 131 | VAddr Process::GetLinearHeapBase() const { |
| 132 | return (kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_SIZE) | 132 | return (kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR) |
| 133 | + memory_region->base; | 133 | + memory_region->base; |
| 134 | } | 134 | } |
| 135 | 135 | ||