diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index a7adbbbe8506..ad45dbaad6b1 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.71 2002/03/09 01:37:19 thorpej Exp $ */ +/* $NetBSD: subr_pool.c,v 1.72 2002/03/09 01:56:27 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.71 2002/03/09 01:37:19 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.72 2002/03/09 01:56:27 thorpej Exp $"); #include "opt_pool.h" #include "opt_poollog.h" @@ -1040,46 +1040,6 @@ pool_put(struct pool *pp, void *v) #define pool_put(h, v) _pool_put((h), (v), __FILE__, __LINE__) #endif -/* - * Add N items to the pool. - */ -int -pool_prime(struct pool *pp, int n) -{ - struct pool_item_header *ph; - caddr_t cp; - int newpages, error = 0; - - simple_lock(&pp->pr_slock); - - newpages = roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; - - while (newpages-- > 0) { - simple_unlock(&pp->pr_slock); - cp = pool_allocator_alloc(pp, PR_NOWAIT); - if (__predict_true(cp != NULL)) - ph = pool_alloc_item_header(pp, cp, PR_NOWAIT); - simple_lock(&pp->pr_slock); - - if (__predict_false(cp == NULL || ph == NULL)) { - error = ENOMEM; - if (cp != NULL) - pool_allocator_free(pp, cp); - break; - } - - pool_prime_page(pp, cp, ph); - pp->pr_npagealloc++; - pp->pr_minpages++; - } - - if (pp->pr_minpages >= pp->pr_maxpages) - pp->pr_maxpages = pp->pr_minpages + 1; /* XXX */ - - simple_unlock(&pp->pr_slock); - return (0); -} - /* * Add a page worth of items to the pool. * diff --git a/sys/sys/pool.h b/sys/sys/pool.h index d684e7c94988..35f7e2aa60f0 100644 --- a/sys/sys/pool.h +++ b/sys/sys/pool.h @@ -1,4 +1,4 @@ -/* $NetBSD: pool.h,v 1.32 2002/03/09 01:33:33 thorpej Exp $ */ +/* $NetBSD: pool.h,v 1.33 2002/03/09 01:56:27 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -218,7 +218,6 @@ void _pool_reclaim(struct pool *, const char *, long); #define pool_reclaim(h) _pool_reclaim((h), __FILE__, __LINE__) #endif /* POOL_DIAGNOSTIC */ -int pool_prime(struct pool *, int); void pool_setlowat(struct pool *, int); void pool_sethiwat(struct pool *, int); void pool_sethardlimit(struct pool *, int, const char *, int);