Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.76.4.1
retrieving revision 1.76.4.2
diff -u -p -r1.76.4.1 -r1.76.4.2
--- src/sys/kern/subr_pool.c	2002/07/15 10:36:39	1.76.4.1
+++ src/sys/kern/subr_pool.c	2002/08/29 05:23:10	1.76.4.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.76.4.1 2002/07/15 10:36:39 gehenna Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.76.4.2 2002/08/29 05:23:10 gehenna Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.76.4.1 2002/07/15 10:36:39 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.76.4.2 2002/08/29 05:23:10 gehenna Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -94,7 +94,7 @@ struct pool_item_header {
 	TAILQ_HEAD(,pool_item)	ph_itemlist;	/* chunk list for this page */
 	LIST_ENTRY(pool_item_header)
 				ph_hashlist;	/* Off-page page headers */
-	int			ph_nmissing;	/* # of chunks in use */
+	unsigned int		ph_nmissing;	/* # of chunks in use */
 	caddr_t			ph_page;	/* this page's address */
 	struct timeval		ph_time;	/* last referenced */
 };
@@ -415,7 +415,7 @@ pool_init(struct pool *pp, size_t size, 
 	if (size < sizeof(struct pool_item))
 		size = sizeof(struct pool_item);
 
-	size = ALIGN(size);
+	size = roundup(size, align);
 #ifdef DIAGNOSTIC
 	if (size > palloc->pa_pagesz)
 		panic("pool_init: pool item size (%lu) too large",
@@ -916,6 +916,7 @@ pool_do_put(struct pool *pp, void *v)
 #endif
 
 	TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
+	KDASSERT(ph->ph_nmissing != 0);
 	ph->ph_nmissing--;
 	pp->pr_nput++;
 	pp->pr_nitems++;
@@ -1125,6 +1126,8 @@ pool_prime_page(struct pool *pp, caddr_t
 	while (n--) {
 		pi = (struct pool_item *)cp;
 
+		KASSERT(((((vaddr_t)pi) + ioff) & (align - 1)) == 0);
+
 		/* Insert on page list */
 		TAILQ_INSERT_TAIL(&ph->ph_itemlist, pi, pi_list);
 #ifdef DIAGNOSTIC