summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2019-03-07 17:26:11 -0500
committerGravatar GitHub2019-03-07 17:26:11 -0500
commitd26ee6e01ea02ca525d5032656563b11d6c3d28a (patch)
treec6c55cc79cb8c7621906f519f66f1ff55b6d1dc1
parentMerge pull request #2196 from DarkLordZach/web-applet-esc (diff)
parentkernel/shared_memory: Get rid of the use of global accessor functions within ... (diff)
downloadyuzu-d26ee6e01ea02ca525d5032656563b11d6c3d28a.tar.gz
yuzu-d26ee6e01ea02ca525d5032656563b11d6c3d28a.tar.xz
yuzu-d26ee6e01ea02ca525d5032656563b11d6c3d28a.zip
Merge pull request #2195 from lioncash/shared-global
kernel/shared_memory: Get rid of the use of global accessor functions within Create()
-rw-r--r--src/core/hle/kernel/shared_memory.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 22d0c1dd5..62861da36 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -6,7 +6,6 @@
6 6
7#include "common/assert.h" 7#include "common/assert.h"
8#include "common/logging/log.h" 8#include "common/logging/log.h"
9#include "core/core.h"
10#include "core/hle/kernel/errors.h" 9#include "core/hle/kernel/errors.h"
11#include "core/hle/kernel/kernel.h" 10#include "core/hle/kernel/kernel.h"
12#include "core/hle/kernel/shared_memory.h" 11#include "core/hle/kernel/shared_memory.h"
@@ -34,8 +33,8 @@ SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, Process* owner_
34 shared_memory->backing_block_offset = 0; 33 shared_memory->backing_block_offset = 0;
35 34
36 // Refresh the address mappings for the current process. 35 // Refresh the address mappings for the current process.
37 if (Core::CurrentProcess() != nullptr) { 36 if (kernel.CurrentProcess() != nullptr) {
38 Core::CurrentProcess()->VMManager().RefreshMemoryBlockMappings( 37 kernel.CurrentProcess()->VMManager().RefreshMemoryBlockMappings(
39 shared_memory->backing_block.get()); 38 shared_memory->backing_block.get());
40 } 39 }
41 } else { 40 } else {