--- src/sys/sys/caps.h	2004/03/14 11:04:12	1.6
+++ src/sys/sys/caps.h	2004/03/31 19:28:25	1.7
@@ -15,6 +15,9 @@
 #ifndef _SYS_MSGPORT_H_
 #include <sys/msgport.h>
 #endif
+#ifndef _SYS_XIO_H_
+#include <sys/xio.h>
+#endif
 
 typedef enum caps_msg_state { 
 	CAPMS_REQUEST, 
@@ -112,7 +115,6 @@ typedef struct caps_kinfo {
 	int			ci_id;
 	int			ci_flags;
 	int			ci_refs;
-	int			ci_mrefs;	/* message (vmspace) refs */
 	caps_type_t		ci_type;
 	caps_gen_t		ci_gen;
 	uid_t			ci_uid;
@@ -138,8 +140,7 @@ typedef struct caps_kinfo {
 typedef struct caps_kmsg {
 	TAILQ_ENTRY(caps_kmsg)	km_node;
 	caps_kinfo_t		km_mcaps;	/* message sender */
-	void			*km_umsg;	/* mcaps vmspace */
-	int			km_umsg_size;	/* mcaps vmspace */
+	struct xio		km_xio;		/* mcaps user data */
 	struct caps_cred	km_ccr;		/* caps cred for msg */
 	struct caps_msgid	km_msgid;
 	int			km_flags;