From 0b43e28595372e84c65d26364fb5ded0cce9d7de Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Thu, 4 Aug 2016 09:25:12 -0700
Subject: [PATCH] Move SysMemForKernel to sceKernelMemory.

---
 Core/HLE/sceKernel.cpp       | 12 ------------
 Core/HLE/sceKernel.h         |  1 -
 Core/HLE/sceKernelMemory.cpp | 12 ++++++++++--
 Core/HLE/sceKernelMemory.h   |  1 +
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
index c3913d7400..f71ea2ed11 100644
--- a/Core/HLE/sceKernel.cpp
+++ b/Core/HLE/sceKernel.cpp
@@ -892,13 +892,6 @@ void Register_LoadExecForKernel()
 	RegisterModule("LoadExecForKernel", ARRAY_SIZE(LoadExecForKernel), LoadExecForKernel);
 }
 
-const HLEFunction SysMemForKernel[] =
-{
-	{0X636C953B, nullptr,                                            "SysMemForKernel_636c953b",                  '?', ""        },
-	{0XC9805775, nullptr,                                            "SysMemForKernel_c9805775",                  '?', ""        },
-	{0X1C1FBFE7, nullptr,                                            "SysMemForKernel_1c1fbfe7",                  '?', ""        },
-};
-
 const HLEFunction ExceptionManagerForKernel[] =
 {
 	{0X3FB264FC, nullptr,                                            "sceKernelRegisterExceptionHandler",         '?', ""        },
@@ -911,11 +904,6 @@ const HLEFunction ExceptionManagerForKernel[] =
 	{0XB15357C9, nullptr,                                            "sceKernelReleaseNmiHandler",                '?', ""        },
 };
 
-void Register_SysMemForKernel()
-{
-	RegisterModule("SysMemForKernel", ARRAY_SIZE(SysMemForKernel), SysMemForKernel);
-}
-
 void Register_ExceptionManagerForKernel()
 {
 	RegisterModule("ExceptionManagerForKernel", ARRAY_SIZE(ExceptionManagerForKernel), ExceptionManagerForKernel);
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 37007ce385..8bab1f3fcc 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -568,5 +568,4 @@ void Register_ThreadManForUser();
 void Register_ThreadManForKernel();
 void Register_LoadExecForUser();
 void Register_LoadExecForKernel();
-void Register_SysMemForKernel();
 void Register_UtilsForKernel();
diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp
index a2525c6933..8183dfa44e 100644
--- a/Core/HLE/sceKernelMemory.cpp
+++ b/Core/HLE/sceKernelMemory.cpp
@@ -2296,8 +2296,16 @@ const HLEFunction SysMemUserForUser[] = {
 	{0XD8DE5C1E, &WrapU_V<SysMemUserForUser_D8DE5C1E>,            "SysMemUserForUser_D8DE5C1E",            'x', ""     },
 };
 
+const HLEFunction SysMemForKernel[] = {
+	{0x636C953B, nullptr,                                         "SysMemForKernel_636c953b",              '?', ""        },
+	{0xC9805775, nullptr,                                         "SysMemForKernel_c9805775",              '?', ""        },
+	{0x1C1FBFE7, nullptr,                                         "SysMemForKernel_1c1fbfe7",              '?', ""        },
+};
 
-void Register_SysMemUserForUser()
-{
+void Register_SysMemForKernel() {
+	RegisterModule("SysMemForKernel", ARRAY_SIZE(SysMemForKernel), SysMemForKernel);
+}
+
+void Register_SysMemUserForUser() {
 	RegisterModule("SysMemUserForUser", ARRAY_SIZE(SysMemUserForUser), SysMemUserForUser);
 }
diff --git a/Core/HLE/sceKernelMemory.h b/Core/HLE/sceKernelMemory.h
index dce6df77e0..2396792436 100644
--- a/Core/HLE/sceKernelMemory.h
+++ b/Core/HLE/sceKernelMemory.h
@@ -66,4 +66,5 @@ int sceKernelGetTlsAddr(SceUID uid);
 int sceKernelFreeTlspl(SceUID uid);
 int sceKernelReferTlsplStatus(SceUID uid, u32 infoPtr);
 
+void Register_SysMemForKernel();
 void Register_SysMemUserForUser();