--- Gnu-Mach/ipc/ipc_space.c	2020/09/02 04:36:56	1.1.1.1
+++ Gnu-Mach/ipc/ipc_space.c	2020/09/02 04:45:08	1.1.1.3
@@ -36,15 +36,14 @@
  *	Functions to manipulate IPC capability spaces.
  */
 
-#include <mach_ipc_compat.h>
-#include <norma_ipc.h>
+#include <string.h>
 
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <kern/assert.h>
 #include <kern/sched_prim.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <ipc/port.h>
 #include <ipc/ipc_entry.h>
 #include <ipc/ipc_splay.h>
@@ -56,12 +55,9 @@
 
 
 
-zone_t ipc_space_zone;
+struct kmem_cache ipc_space_cache;
 ipc_space_t ipc_space_kernel;
 ipc_space_t ipc_space_reply;
-#if	NORMA_IPC
-ipc_space_t ipc_space_remote;
-#endif	NORMA_IPC
 
 /*
  *	Routine:	ipc_space_reference
@@ -153,33 +149,6 @@ ipc_space_create(
 	space->is_tree_small = 0;
 	space->is_tree_hash = 0;
 
-#if	MACH_IPC_COMPAT
-    {
-	mach_port_t name;
-	ipc_port_t port;
-	kern_return_t kr;
-
-	/*
-	 *	ipc_port_alloc_compat probably won't look at is_notify,
-	 *	but make sure all fields have sane values anyway.
-	 */
-
-	space->is_notify = IP_NULL;
-
-	kr = ipc_port_alloc_compat(space, &name, &port);
-	if (kr != KERN_SUCCESS) {
-		ipc_space_destroy(space);
-		is_release(space);
-		return kr;
-	}
-
-	ip_reference(port);
-	port->ip_srights++;
-	ip_unlock(port);
-	space->is_notify = port;
-    }
-#endif	MACH_IPC_COMPAT
-
 	*spacep = space;
 	return KERN_SUCCESS;
 }
@@ -302,11 +271,6 @@ ipc_space_destroy(
 	}
 	ipc_splay_traverse_finish(&space->is_tree);
 
-#if	MACH_IPC_COMPAT
-	if (IP_VALID(space->is_notify))
-		ipc_port_release_send(space->is_notify);
-#endif	MACH_IPC_COMPAT
-
 	/*
 	 *	Because the space is now dead,
 	 *	we must release the "active" reference for it.