--- Gnu-Mach/include/mach/mach.defs	2020/09/02 04:45:39	1.1.1.3
+++ Gnu-Mach/include/mach/mach.defs	2020/09/02 04:52:28	1.1.1.5
@@ -46,6 +46,10 @@ userprefix r_;
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
+#ifdef	MACH_IMPORTS
+MACH_IMPORTS
+#endif
+
 skip;	/* old port_allocate */
 skip;	/* old port_deallocate */
 skip;	/* old port_enable */
@@ -54,6 +58,9 @@ skip;	/* old port_select */
 skip;	/* old port_set_backlog */
 skip;	/* old port_status */
 
+/* We use only a handful of RPCs as client.  Skip the rest.  */
+#if	! KERNEL_USER
+
 /*
  *	Create a new task with an empty set of IPC rights,
  *	and having an address space constructed from the
@@ -306,6 +313,18 @@ skip;	/* old u*x_pid */
 skip;	/* old netipc_listen */
 skip;	/* old netipc_ignore */
 
+#else	/* ! KERNEL_USER */
+
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;
+
+#endif	/* ! KERNEL_USER */
+
 /*
  *	Provide the data contents of a range of the given memory
  *	object, with the access restriction specified.  [Only
@@ -347,6 +366,8 @@ routine memory_object_get_attributes(
 	out	may_cache	: boolean_t;
 	out	copy_strategy	: memory_object_copy_strategy_t);
 
+#if	! KERNEL_USER
+
 /*
  *	Sets the default memory manager, the port to which
  *	newly-created temporary memory objects are delivered.
@@ -357,6 +378,12 @@ routine vm_set_default_memory_manager(
 		host_priv	: host_priv_t;
 	inout	default_manager	: mach_port_make_send_t);
 
+#else	/* ! KERNEL_USER */
+
+skip;
+
+#endif	/* ! KERNEL_USER */
+
 skip;	/* old pager_flush_request */
 
 /*
@@ -409,6 +436,8 @@ skip;	/* old netport_enter */
 skip;	/* old netport_remove */
 skip;	/* old thread_set_priority */
 
+#if	! KERNEL_USER
+
 /*
  *	Increment the suspend count for the target task.
  *	No threads within a task may run when the suspend
@@ -609,6 +638,18 @@ routine vm_map(
 		inheritance	: vm_inherit_t);
 #endif	/* EMULATOR */
 
+#else	/* ! KERNEL_USER */
+
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;	skip;
+skip;	skip;	skip;	skip;
+
+#endif	/* ! KERNEL_USER */
+
 /*
  *	Indicate that a range of the specified memory object cannot
  *	be provided at this time.  [Threads waiting for memory pages
@@ -680,6 +721,8 @@ simpleroutine memory_object_change_attri
 		reply_to	: mach_port_t =
 			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
 
+#if ! KERNEL_USER
+
 skip;	/* old host_callout_statistics_reset */
 skip;	/* old port_set_select */
 skip;	/* old port_set_backup */
@@ -698,6 +741,8 @@ routine vm_machine_attribute(
 
 skip;	/* old host_fpa_counters_reset */
 
+#endif	/* ! KERNEL_USER */
+
 /*
  *	There is no more room in this interface for additional calls.
  */