This is the first part of the new kernel memory allocator. This replaces

malloc(9) and vm_zone with a slab like allocator.

Reviewed by:	arch@

2 files changed, 3 insertions, 2 deletions

diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 00392b0..187c677 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -41,6 +41,7 @@
 
 #include <net/route.h>
 #include <netinet6/ipsec.h> /* for IPSEC */
+#include <vm/vm_zone.h>
 
 #define	in6pcb		inpcb	/* for KAME src sync over BSD*'s */
 #define	in6p_sp		inp_sp	/* for KAME src sync over BSD*'s */
@@ -241,7 +242,7 @@ struct inpcbinfo {		/* XXX documentation, prefixes */
 	u_short	lastport;
 	u_short	lastlow;
 	u_short	lasthi;
-	struct	vm_zone *ipi_zone; /* zone to allocate pcbs from */
+	vm_zone_t ipi_zone; /* zone to allocate pcbs from */
 	u_int	ipi_count;	/* number of pcbs in this list */
 	u_quad_t ipi_gencnt;	/* current generation count */
 };
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 9ec0804..3459fa1 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -114,7 +114,7 @@ static struct syncache *syncookie_lookup(struct in_conninfo *,
 
 struct tcp_syncache {
 	struct	syncache_head *hashbase;
-	struct	vm_zone *zone;
+	vm_zone_t zone;
 	u_int	hashsize;
 	u_int	hashmask;
 	u_int	bucket_limit;