--- Gnu-Mach/ipc/ipc_kmsg.h	2020/09/02 04:42:32	1.1.1.2
+++ Gnu-Mach/ipc/ipc_kmsg.h	2020/09/02 04:45:03	1.1.1.3
@@ -34,21 +34,16 @@
 #ifndef	_IPC_IPC_KMSG_H_
 #define _IPC_IPC_KMSG_H_
 
-#include <cpus.h>
-#include <mach_ipc_compat.h>
-#include <norma_ipc.h>
-
 #include <mach/machine/vm_types.h>
 #include <mach/message.h>
 #include <kern/assert.h>
-#include "cpu_number.h"
+#include <kern/cpu_number.h>
 #include <kern/macro_help.h>
 #include <kern/kalloc.h>
 #include <ipc/ipc_marequest.h>
-#if	NORMA_IPC
-#include <vm/vm_page.h>
+#include <ipc/ipc_object.h>
+#include <ipc/ipc_types.h>
 #include <vm/vm_map.h>
-#endif	/* NORMA_IPC */
 
 /*
  *	This structure is only the header for a kmsg buffer;
@@ -66,11 +61,6 @@ typedef struct ipc_kmsg {
 	struct ipc_kmsg *ikm_next, *ikm_prev;
 	vm_size_t ikm_size;
 	ipc_marequest_t ikm_marequest;
-#if	NORMA_IPC
-	vm_page_t ikm_page;
-	vm_map_copy_t ikm_copy;
-	unsigned long ikm_source_node;
-#endif	/* NORMA_IPC */
 	mach_msg_header_t ikm_header;
 } *ipc_kmsg_t;
 
@@ -230,62 +220,52 @@ MACRO_BEGIN								\
 MACRO_END
 
 extern void
-ipc_kmsg_destroy(/* ipc_kmsg_t */);
+ipc_kmsg_destroy(ipc_kmsg_t);
 
 extern void
-ipc_kmsg_clean(/* ipc_kmsg_t */);
+ipc_kmsg_clean(ipc_kmsg_t);
 
 extern void
-ipc_kmsg_free(/* ipc_kmsg_t */);
+ipc_kmsg_free(ipc_kmsg_t);
 
 extern mach_msg_return_t
-ipc_kmsg_get(/* mach_msg_header_t *, mach_msg_size_t, ipc_kmsg_t * */);
+ipc_kmsg_get(mach_msg_header_t *, mach_msg_size_t, ipc_kmsg_t *);
 
 extern mach_msg_return_t
-ipc_kmsg_get_from_kernel(/* mach_msg_header_t *, mach_msg_size_t,
-			    ipc_kmsg_t * */);
+ipc_kmsg_get_from_kernel(mach_msg_header_t *, mach_msg_size_t, ipc_kmsg_t *);
 
 extern mach_msg_return_t
-ipc_kmsg_put(/* mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t */);
+ipc_kmsg_put(mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t);
 
 extern void
-ipc_kmsg_put_to_kernel(/* mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t */);
+ipc_kmsg_put_to_kernel(mach_msg_header_t *, ipc_kmsg_t, mach_msg_size_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyin_header(/* mach_msg_header_t *, ipc_space_t, mach_port_t */);
+ipc_kmsg_copyin_header(mach_msg_header_t *, ipc_space_t, mach_port_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyin(/* ipc_kmsg_t, ipc_space_t, vm_map_t, mach_port_t */);
+ipc_kmsg_copyin(ipc_kmsg_t, ipc_space_t, vm_map_t, mach_port_t);
 
 extern void
-ipc_kmsg_copyin_from_kernel(/* ipc_kmsg_t */);
+ipc_kmsg_copyin_from_kernel(ipc_kmsg_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyout_header(/* mach_msg_header_t *, ipc_space_t, mach_port_t */);
+ipc_kmsg_copyout_header(mach_msg_header_t *, ipc_space_t, mach_port_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyout_object(/* ipc_space_t, ipc_object_t,
-			   mach_msg_type_name_t, mach_port_t * */);
+ipc_kmsg_copyout_object(ipc_space_t, ipc_object_t,
+			mach_msg_type_name_t, mach_port_t *);
 
 extern mach_msg_return_t
-ipc_kmsg_copyout_body(/* vm_offset_t, vm_offset_t, ipc_space_t, vm_map_t */);
+ipc_kmsg_copyout_body(vm_offset_t, vm_offset_t, ipc_space_t, vm_map_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyout(/* ipc_kmsg_t, ipc_space_t, vm_map_t, mach_port_t */);
+ipc_kmsg_copyout(ipc_kmsg_t, ipc_space_t, vm_map_t, mach_port_t);
 
 extern mach_msg_return_t
-ipc_kmsg_copyout_pseudo(/* ipc_kmsg_t, ipc_space_t, vm_map_t */);
+ipc_kmsg_copyout_pseudo(ipc_kmsg_t, ipc_space_t, vm_map_t);
 
 extern void
-ipc_kmsg_copyout_dest(/* ipc_kmsg_t, ipc_space_t */);
-
-#if	MACH_IPC_COMPAT
-
-extern mach_msg_return_t
-ipc_kmsg_copyin_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */);
-
-extern mach_msg_return_t
-ipc_kmsg_copyout_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */);
+ipc_kmsg_copyout_dest(ipc_kmsg_t, ipc_space_t);
 
-#endif	/* MACH_IPC_COMPAT */
 #endif	/* _IPC_IPC_KMSG_H_ */