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.190.6.1
retrieving revision 1.193
diff -u -p -r1.190.6.1 -r1.193
--- src/sys/kern/subr_pool.c	2012/02/18 07:35:32	1.190.6.1
+++ src/sys/kern/subr_pool.c	2012/01/29 20:20:18	1.193
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.190.6.1 2012/02/18 07:35:32 mrg Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.193 2012/01/29 20:20:18 he Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.190.6.1 2012/02/18 07:35:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.193 2012/01/29 20:20:18 he Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pool.h"
@@ -2730,10 +2730,13 @@ struct pool_allocator pool_allocator_kme
 };
 #endif
 
+void	*pool_page_alloc_nointr(struct pool *, int);
+void	pool_page_free_nointr(struct pool *, void *);
+
 #ifdef POOL_SUBPAGE
 struct pool_allocator pool_allocator_nointr_fullpage = {
-	.pa_alloc = pool_page_alloc,
-	.pa_free = pool_page_free,
+	.pa_alloc = pool_page_alloc_nointr,
+	.pa_free = pool_page_free_nointr,
 	.pa_pagesz = 0
 };
 #else
@@ -2754,6 +2757,9 @@ struct pool_allocator pool_allocator_kme
 	.pa_pagesz = POOL_SUBPAGE
 };
 
+void	*pool_subpage_alloc_nointr(struct pool *, int);
+void	pool_subpage_free_nointr(struct pool *, void *);
+
 struct pool_allocator pool_allocator_nointr = {
 	.pa_alloc = pool_subpage_alloc,
 	.pa_free = pool_subpage_free,
@@ -2844,6 +2850,20 @@ pool_subpage_free(struct pool *pp, void 
 	pool_put(&psppool, v);
 }
 
+/* We don't provide a real nointr allocator.  Maybe later. */
+void *
+pool_subpage_alloc_nointr(struct pool *pp, int flags)
+{
+
+	return (pool_subpage_alloc(pp, flags));
+}
+
+void
+pool_subpage_free_nointr(struct pool *pp, void *v)
+{
+
+	pool_subpage_free(pp, v);
+}
 #endif /* POOL_SUBPAGE */
 
 #if defined(DDB)