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 retrieving revision 1.125 retrieving revision 1.126 diff -u -p -r1.125 -r1.126 --- src/sys/kern/subr_pool.c 2007/02/09 21:55:31 1.125 +++ src/sys/kern/subr_pool.c 2007/02/21 23:00:05 1.126 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.125 2007/02/09 21:55:31 ad Exp $ */ +/* $NetBSD: subr_pool.c,v 1.126 2007/02/21 23:00:05 thorpej Exp $ */ /*- * Copyright (c) 1997, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.125 2007/02/09 21:55:31 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.126 2007/02/21 23:00:05 thorpej Exp $"); #include "opt_pool.h" #include "opt_poollog.h" @@ -474,7 +474,7 @@ pr_rmpage(struct pool *pp, struct pool_i pool_update_curpage(pp); } -static boolean_t +static bool pa_starved_p(struct pool_allocator *pa) { @@ -2371,7 +2371,7 @@ pool_allocator_free(struct pool *pp, voi void * pool_page_alloc(struct pool *pp, int flags) { - boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; + bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE; return ((void *) uvm_km_alloc_poolpage_cache(kmem_map, waitok)); } @@ -2386,7 +2386,7 @@ pool_page_free(struct pool *pp, void *v) static void * pool_page_alloc_meta(struct pool *pp, int flags) { - boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; + bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE; return ((void *) uvm_km_alloc_poolpage(kmem_map, waitok)); } @@ -2438,7 +2438,7 @@ pool_subpage_free_nointr(struct pool *pp void * pool_page_alloc_nointr(struct pool *pp, int flags) { - boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; + bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE; return ((void *) uvm_km_alloc_poolpage_cache(kernel_map, waitok)); }