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.60.2.4 retrieving revision 1.78 diff -u -p -r1.60.2.4 -r1.78 --- src/sys/kern/subr_pool.c 2002/10/10 18:43:14 1.60.2.4 +++ src/sys/kern/subr_pool.c 2002/07/30 01:41:00 1.78 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.60.2.4 2002/10/10 18:43:14 jdolecek Exp $ */ +/* $NetBSD: subr_pool.c,v 1.78 2002/07/30 01:41:00 thorpej Exp $ */ /*- * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.60.2.4 2002/10/10 18:43:14 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.78 2002/07/30 01:41:00 thorpej 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 */ - unsigned int ph_nmissing; /* # of chunks in use */ + int ph_nmissing; /* # of chunks in use */ caddr_t ph_page; /* this page's address */ struct timeval ph_time; /* last referenced */ }; @@ -564,7 +564,7 @@ pool_destroy(struct pool *pp) #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { pr_printlog(pp, NULL, printf); - panic("pool_destroy: pool busy: still out: %u", + panic("pool_destroy: pool busy: still out: %u\n", pp->pr_nout); } #endif @@ -715,7 +715,7 @@ pool_get(struct pool *pp, int flags) simple_unlock(&pp->pr_slock); printf("pool_get: %s: curpage NULL, nitems %u\n", pp->pr_wchan, pp->pr_nitems); - panic("pool_get: nitems inconsistent"); + panic("pool_get: nitems inconsistent\n"); } #endif @@ -785,7 +785,7 @@ pool_get(struct pool *pp, int flags) simple_unlock(&pp->pr_slock); printf("pool_get: %s: items on itemlist, nitems %u\n", pp->pr_wchan, pp->pr_nitems); - panic("pool_get: nitems inconsistent"); + panic("pool_get: nitems inconsistent\n"); } #endif @@ -916,7 +916,6 @@ 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++;