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.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- src/sys/kern/subr_pool.c	2006/10/12 01:32:18	1.123
+++ src/sys/kern/subr_pool.c	2006/11/01 10:17:58	1.124
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.123 2006/10/12 01:32:18 christos Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.124 2006/11/01 10:17:58 yamt 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.123 2006/10/12 01:32:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.124 2006/11/01 10:17:58 yamt Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -484,8 +484,7 @@ pa_starved_p(struct pool_allocator *pa)
 }
 
 static int
-pool_reclaim_callback(struct callback_entry *ce __unused, void *obj,
-    void *arg __unused)
+pool_reclaim_callback(struct callback_entry *ce, void *obj, void *arg)
 {
 	struct pool *pp = obj;
 	struct pool_allocator *pa = pp->pr_alloc;
@@ -1620,7 +1619,7 @@ pool_reclaim(struct pool *pp)
  * Note, we must never be called from an interrupt context.
  */
 void
-pool_drain(void *arg __unused)
+pool_drain(void *arg)
 {
 	struct pool *pp;
 	int s;
@@ -1704,7 +1703,7 @@ pool_printit(struct pool *pp, const char
 }
 
 static void
-pool_print_pagelist(struct pool *pp __unused, struct pool_pagelist *pl,
+pool_print_pagelist(struct pool *pp, struct pool_pagelist *pl,
     void (*pr)(const char *, ...))
 {
 	struct pool_item_header *ph;
@@ -2354,7 +2353,7 @@ pool_allocator_free(struct pool *pp, voi
 }
 
 void *
-pool_page_alloc(struct pool *pp __unused, int flags)
+pool_page_alloc(struct pool *pp, int flags)
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
@@ -2362,14 +2361,14 @@ pool_page_alloc(struct pool *pp __unused
 }
 
 void
-pool_page_free(struct pool *pp __unused, void *v)
+pool_page_free(struct pool *pp, void *v)
 {
 
 	uvm_km_free_poolpage_cache(kmem_map, (vaddr_t) v);
 }
 
 static void *
-pool_page_alloc_meta(struct pool *pp __unused, int flags)
+pool_page_alloc_meta(struct pool *pp, int flags)
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
@@ -2377,7 +2376,7 @@ pool_page_alloc_meta(struct pool *pp __u
 }
 
 static void
-pool_page_free_meta(struct pool *pp __unused, void *v)
+pool_page_free_meta(struct pool *pp, void *v)
 {
 
 	uvm_km_free_poolpage(kmem_map, (vaddr_t) v);
@@ -2421,7 +2420,7 @@ pool_subpage_free_nointr(struct pool *pp
 }
 #endif /* POOL_SUBPAGE */
 void *
-pool_page_alloc_nointr(struct pool *pp __unused, int flags)
+pool_page_alloc_nointr(struct pool *pp, int flags)
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
@@ -2429,7 +2428,7 @@ pool_page_alloc_nointr(struct pool *pp _
 }
 
 void
-pool_page_free_nointr(struct pool *pp __unused, void *v)
+pool_page_free_nointr(struct pool *pp, void *v)
 {
 
 	uvm_km_free_poolpage_cache(kernel_map, (vaddr_t) v);