3 files changed, 30 insertions, 24 deletions
diff --git a/include/common/kernel/sysmem/memblock.h b/include/common/kernel/sysmem/memblock.h
new file mode 100644
index 0000000..21ec081
--- /dev/null
+++ b/include/common/kernel/sysmem/memblock.h
@@ -0,0 +1,30 @@
+/*
+	Vita Development Suite Libraries
+*/
+
+#ifndef _VDSUITE_COMMON_KERNEL_SYSMEM_MEMBLOCK_H
+#define _VDSUITE_COMMON_KERNEL_SYSMEM_MEMBLOCK_H
+
+#include_next <kernel/sysmem/memblock.h>
+
+/** @name sceKernelAllocMemBlockで指定可能なメモリタイプ
+ */
+/*@{*/
+
+#define SCE_KERNEL_MEMBLOCK_TYPE_USER_RX					0x0c20d050U
+
+#define SCE_KERNEL_MEMBLOCK_TYPE_SHARED_RX					0x0390d050U
+#define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RX					0x1020d005U
+#define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RW					0x1020d006U
+#define SCE_KERNEL_MEMBLOCK_TYPE_RW_UNK0					0x6020d006U
+
+/*@}*/
+
+/*----- memory access permission -----*/
+
+/**
+ * executable memory
+ */
+#define SCE_KERNEL_MEMORY_ACCESS_X		0x01U
+
+#endif  /* _VDSUITE_COMMON_KERNEL_SYSMEM_MEMBLOCK_H */
diff --git a/include/kernel/kernel/sysmem.h b/include/kernel/kernel/sysmem.h
index dbc4e0c..19efd72 100644
--- a/include/kernel/kernel/sysmem.h
+++ b/include/kernel/kernel/sysmem.h
@@ -12,12 +12,6 @@
 
 SCE_CDECL_BEGIN
 
-#define SCE_KERNEL_MEMBLOCK_TYPE_SHARED_RX                 0x0390D050
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_RX                   0x0C20D050
-#define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RX                 0x1020D005
-#define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RW                 0x1020D006
-#define SCE_KERNEL_MEMBLOCK_TYPE_RW_UNK0                   0x6020D006
-
 typedef enum SceKernelAllocMemBlockAttr {
 	SCE_KERNEL_ALLOC_MEMBLOCK_ATTR_HAS_VBASE          = 0x00000001U,
 	SCE_KERNEL_ALLOC_MEMBLOCK_ATTR_HAS_PBASE          = 0x00000002U,
diff --git a/include/user/kernel/sysmem/memblock.h b/include/user/kernel/sysmem/memblock.h
index 96033da..6a86abd 100644
--- a/include/user/kernel/sysmem/memblock.h
+++ b/include/user/kernel/sysmem/memblock.h
@@ -7,17 +7,6 @@
 
 #include_next <kernel/sysmem/memblock.h>
 
-/** @name sceKernelAllocMemBlockで指定可能なメモリタイプ
- */
-/*@{*/
-
-/**
- * memory block type for read execute cache allocated on LPDDR2
- */
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_RX					0x0c20d050U
-
-/*@}*/
-
 SCE_CDECL_BEGIN
 
 #if !defined(_LANGUAGE_ASSEMBLY)
@@ -32,13 +21,6 @@ typedef struct SceKernelAllocMemBlockOptInternal {
 	SceUInt32	reserved[10];
 } SceKernelAllocMemBlockOptInternal;
 
-/*----- memory access permission -----*/
-
-/**
- * executable memory
- */
-#define SCE_KERNEL_MEMORY_ACCESS_X		0x01U
-
 #endif	/* !defined(_LANGUAGE_ASSEMBLY) */
 
 SCE_CDECL_END