So whe have this "default" pool allocator called
"pool_allocator_nointr", which is perfectly safe to be used in
interrupt context. That always confuses the hell out of me. So here
is a diff that gives the allocators more sensible names. With this
change we have:
* pool_allocator_single: A single page allocator that is safe for use
in interrupts. It is very efficient, especially on
HAVE_PMAP_DIRECT architectures. It is the default allocator and
there is no real reason to use anything else for small-ish items.
* pool_allocator_multi: A multi page allocator that is safe for use in
interrupts. It is somewhat less efficient as it almost always
needs to allocate kva to map the allocated pages. It allocates
kva from kmem_map, which has a fairly limited supply.
* pool_allocator_multi_ni: A multi page allocator that is *not* safe
for use in interrupts. Also less efficient than
pool_allocator_single. It allocates kva from kernel_map, which is
significantly more plentyful.
This diff is purely mechanical. This means that it also changes some
pool_allocator_nointr into pool_allocator_single where the intention
was to signal that the pool would never be used in interrupt context.
However, using pool_allocator_single in those cases isn't a big deal
as there is no downside. But we could consider changing those into
passing NULL and setting the PR_WAITOK flag to the pool_init calls in
question.
I'll also change the man page to remove the lies about
pool_allocator_nointr.
ok?
Index: arch/alpha/alpha/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/alpha/pmap.c,v
retrieving revision 1.78
diff -u -p -r1.78 pmap.c
--- arch/alpha/alpha/pmap.c 20 Jul 2015 00:16:16 -0000 1.78
+++ arch/alpha/alpha/pmap.c 29 Aug 2015 21:31:54 -0000
@@ -850,7 +850,7 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
*/
pmap_ncpuids = ncpuids;
pool_init(&pmap_pmap_pool, PMAP_SIZEOF(pmap_ncpuids), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pmap_l1pt_pool, PAGE_SIZE, 0, 0, 0, "l1ptpl",
&pmap_l1pt_allocator);
pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
Index: arch/amd64/amd64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/pmap.c,v
retrieving revision 1.94
diff -u -p -r1.94 pmap.c
--- arch/amd64/amd64/pmap.c 10 Jul 2015 10:08:49 -0000 1.94
+++ arch/amd64/amd64/pmap.c 29 Aug 2015 21:31:55 -0000
@@ -682,7 +682,7 @@ pmap_bootstrap(paddr_t first_avail, padd
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, PR_WAITOK,
"pmappl", NULL);
pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_sethiwat(&pmap_pv_pool, 32 * 1024);
pool_setipl(&pmap_pv_pool, IPL_VM);
Index: arch/arm/arm/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/pmap.c,v
retrieving revision 1.55
diff -u -p -r1.55 pmap.c
--- arch/arm/arm/pmap.c 18 Aug 2015 20:25:28 -0000 1.55
+++ arch/arm/arm/pmap.c 29 Aug 2015 21:31:55 -0000
@@ -3730,7 +3730,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt,
* Initialize the pmap pool and cache
*/
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
/*
* Initialize the pv pool.
@@ -3748,7 +3748,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt,
* Initialise the L2 descriptor table pool and cache
*/
pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL, 0,
- 0, "l2ptppl", &pool_allocator_nointr);
+ 0, "l2ptppl", &pool_allocator_single);
cpu_dcache_wbinv_all();
}
Index: arch/arm/arm/pmap7.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/pmap7.c,v
retrieving revision 1.20
diff -u -p -r1.20 pmap7.c
--- arch/arm/arm/pmap7.c 2 Feb 2015 09:29:53 -0000 1.20
+++ arch/arm/arm/pmap7.c 29 Aug 2015 21:31:55 -0000
@@ -2791,7 +2791,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt,
* Initialize the pmap pool.
*/
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
/*
* Initialize the pv pool.
@@ -2809,7 +2809,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt,
* Initialise the L2 descriptor table pool.
*/
pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL, 0,
- 0, "l2ptppl", &pool_allocator_nointr);
+ 0, "l2ptppl", &pool_allocator_single);
cpu_dcache_wbinv_all();
cpu_sdcache_wbinv_all();
Index: arch/hppa/hppa/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/pmap.c,v
retrieving revision 1.167
diff -u -p -r1.167 pmap.c
--- arch/hppa/hppa/pmap.c 13 Jul 2015 13:07:39 -0000 1.167
+++ arch/hppa/hppa/pmap.c 29 Aug 2015 21:31:55 -0000
@@ -632,7 +632,7 @@ pmap_init(void)
DPRINTF(PDB_FOLLOW|PDB_INIT, ("pmap_init()\n"));
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pmappv",
NULL);
pool_setipl(&pmap_pv_pool, IPL_VM);
Index: arch/hppa64/hppa64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/pmap.c,v
retrieving revision 1.27
diff -u -p -r1.27 pmap.c
--- arch/hppa64/hppa64/pmap.c 11 Feb 2015 03:24:47 -0000 1.27
+++ arch/hppa64/hppa64/pmap.c 29 Aug 2015 21:31:55 -0000
@@ -546,7 +546,7 @@ pmap_init(void)
DPRINTF(PDB_FOLLOW|PDB_INIT, ("pmap_init()\n"));
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pmap_pv_pool, sizeof(struct pv_entry),0,0,0, "pmappv", NULL);
pool_setlowat(&pmap_pv_pool, pmap_pvlowat);
pool_sethiwat(&pmap_pv_pool, pmap_pvlowat * 32);
Index: arch/i386/i386/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/pmap.c,v
retrieving revision 1.183
diff -u -p -r1.183 pmap.c
--- arch/i386/i386/pmap.c 25 Aug 2015 04:57:31 -0000 1.183
+++ arch/i386/i386/pmap.c 29 Aug 2015 21:31:56 -0000
@@ -1027,7 +1027,7 @@ pmap_bootstrap(vaddr_t kva_start)
*/
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 32, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
&pmap_pv_page_allocator);
pool_setipl(&pmap_pv_pool, IPL_VM);
Index: arch/m88k/m88k/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/pmap.c,v
retrieving revision 1.81
diff -u -p -r1.81 pmap.c
--- arch/m88k/m88k/pmap.c 29 Jul 2015 17:54:35 -0000 1.81
+++ arch/m88k/m88k/pmap.c 29 Aug 2015 21:31:56 -0000
@@ -866,7 +866,7 @@ pmap_init(void)
{
DPRINTF(CD_INIT, ("pmap_init()\n"));
pool_init(&pmappool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pvpool, sizeof(pv_entry_t), 0, 0, 0, "pvpl", NULL);
}
Index: arch/powerpc/powerpc/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/powerpc/powerpc/pmap.c,v
retrieving revision 1.160
diff -u -p -r1.160 pmap.c
--- arch/powerpc/powerpc/pmap.c 20 Jul 2015 00:16:16 -0000 1.160
+++ arch/powerpc/powerpc/pmap.c 29 Aug 2015 21:31:57 -0000
@@ -2094,7 +2094,7 @@ pmap_init()
pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmap", NULL);
pool_setlowat(&pmap_pmap_pool, 2);
pool_init(&pmap_vp_pool, sizeof(struct pmapvp), 0, 0, 0, "vp",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_setlowat(&pmap_vp_pool, 10);
pool_init(&pmap_pted_pool, sizeof(struct pte_desc), 0, 0, 0, "pted",
NULL);
Index: arch/sh/sh/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sh/sh/pmap.c,v
retrieving revision 1.22
diff -u -p -r1.22 pmap.c
--- arch/sh/sh/pmap.c 16 Nov 2014 12:30:58 -0000 1.22
+++ arch/sh/sh/pmap.c 29 Aug 2015 21:31:57 -0000
@@ -204,7 +204,7 @@ pmap_init()
{
/* Initialize pmap module */
pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&__pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
&pmap_pv_page_allocator);
pool_setlowat(&__pmap_pv_pool, 16);
Index: arch/solbourne/solbourne/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/solbourne/solbourne/pmap.c,v
retrieving revision 1.10
diff -u -p -r1.10 pmap.c
--- arch/solbourne/solbourne/pmap.c 2 May 2015 14:33:19 -0000 1.10
+++ arch/solbourne/solbourne/pmap.c 29 Aug 2015 21:31:58 -0000
@@ -482,7 +482,7 @@ void
pmap_init()
{
pool_init(&pmappool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pvpool, sizeof(struct pvlist), 0, 0, 0, "pvpl", NULL);
}
Index: arch/sparc64/sparc64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/pmap.c,v
retrieving revision 1.92
diff -u -p -r1.92 pmap.c
--- arch/sparc64/sparc64/pmap.c 10 Jul 2015 12:11:41 -0000 1.92
+++ arch/sparc64/sparc64/pmap.c 29 Aug 2015 21:31:58 -0000
@@ -1382,7 +1382,7 @@ pmap_init(void)
pool_init(&pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry", NULL);
pool_setipl(&pv_pool, IPL_VM);
pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
- &pool_allocator_nointr);
+ &pool_allocator_single);
}
/* Start of non-cachable physical memory on UltraSPARC-III. */
Index: compat/linux/linux_futex.c
===================================================================
RCS file: /cvs/src/sys/compat/linux/linux_futex.c,v
retrieving revision 1.16
diff -u -p -r1.16 linux_futex.c
--- compat/linux/linux_futex.c 20 Aug 2014 06:03:20 -0000 1.16
+++ compat/linux/linux_futex.c 29 Aug 2015 21:31:58 -0000
@@ -416,9 +416,9 @@ futex_pool_init(void)
if (!futex_pool_initialized) {
pool_init(&futex_pool, sizeof(struct futex), 0, 0, PR_DEBUGCHK,
- "futexpl", &pool_allocator_nointr);
+ "futexpl", &pool_allocator_single);
pool_init(&futex_wp_pool, sizeof(struct waiting_proc), 0, 0,
- PR_DEBUGCHK, "futexwppl", &pool_allocator_nointr);
+ PR_DEBUGCHK, "futexwppl", &pool_allocator_single);
futex_pool_initialized = 1;
}
}
Index: conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/conf/GENERIC,v
retrieving revision 1.220
diff -u -p -r1.220 GENERIC
--- conf/GENERIC 10 Aug 2015 20:35:36 -0000 1.220
+++ conf/GENERIC 29 Aug 2015 21:31:58 -0000
@@ -7,7 +7,7 @@
option DDB # in-kernel debugger
#option DDB_SAFE_CONSOLE # allow break into ddb during boot
-#makeoptions DEBUG="-g" # compile full symbol table
+makeoptions DEBUG="-g" # compile full symbol table
#makeoptions PROF="-pg" # build profiled kernel
#option GPROF # kernel profiling, kgmon(8)
option DIAGNOSTIC # internal consistency checks
Index: dev/pci/if_bnx.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_bnx.c,v
retrieving revision 1.112
diff -u -p -r1.112 if_bnx.c
--- dev/pci/if_bnx.c 24 Jul 2015 01:19:18 -0000 1.112
+++ dev/pci/if_bnx.c 29 Aug 2015 21:31:59 -0000
@@ -4701,7 +4701,7 @@ bnx_init(void *xsc)
bnx_tx_pool = malloc(sizeof(*bnx_tx_pool), M_DEVBUF, M_WAITOK);
if (bnx_tx_pool != NULL) {
pool_init(bnx_tx_pool, sizeof(struct bnx_pkt),
- 0, 0, 0, "bnxpkts", &pool_allocator_nointr);
+ 0, 0, 0, "bnxpkts", &pool_allocator_single);
} else
txpl = 0;
}
Index: dev/pci/drm/drm_drv.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/drm_drv.c,v
retrieving revision 1.135
diff -u -p -r1.135 drm_drv.c
--- dev/pci/drm/drm_drv.c 17 Apr 2015 00:54:41 -0000 1.135
+++ dev/pci/drm/drm_drv.c 29 Aug 2015 21:31:59 -0000
@@ -424,7 +424,7 @@ drm_attach(struct device *parent, struct
KASSERT(dev->driver->gem_size >= sizeof(struct drm_gem_object));
/* XXX unique name */
pool_init(&dev->objpl, dev->driver->gem_size, 0, 0, 0,
- "drmobjpl", &pool_allocator_nointr);
+ "drmobjpl", &pool_allocator_single);
}
printf("\n");
Index: isofs/udf/udf_vfsops.c
===================================================================
RCS file: /cvs/src/sys/isofs/udf/udf_vfsops.c,v
retrieving revision 1.45
diff -u -p -r1.45 udf_vfsops.c
--- isofs/udf/udf_vfsops.c 14 Mar 2015 03:38:50 -0000 1.45
+++ isofs/udf/udf_vfsops.c 29 Aug 2015 21:31:59 -0000
@@ -103,11 +103,11 @@ int
udf_init(struct vfsconf *foo)
{
pool_init(&udf_trans_pool, MAXNAMLEN * sizeof(unicode_t), 0, 0, 0,
- "udftrpl", &pool_allocator_nointr);
+ "udftrpl", &pool_allocator_single);
pool_init(&unode_pool, sizeof(struct unode), 0, 0, 0,
- "udfndpl", &pool_allocator_nointr);
+ "udfndpl", &pool_allocator_single);
pool_init(&udf_ds_pool, sizeof(struct udf_dirstream), 0, 0, 0,
- "udfdspl", &pool_allocator_nointr);
+ "udfdspl", &pool_allocator_single);
return (0);
}
Index: kern/subr_pool.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_pool.c,v
retrieving revision 1.188
diff -u -p -r1.188 subr_pool.c
--- kern/subr_pool.c 21 Aug 2015 03:03:44 -0000 1.188
+++ kern/subr_pool.c 29 Aug 2015 21:31:59 -0000
@@ -127,28 +127,27 @@ void *pool_page_alloc(struct pool *, int
void pool_page_free(struct pool *, void *);
/*
- * safe for interrupts, name preserved for compat this is the default
- * allocator
+ * safe for interrupts; this is the default allocator
*/
-struct pool_allocator pool_allocator_nointr = {
+struct pool_allocator pool_allocator_single = {
pool_page_alloc,
pool_page_free
};
-void *pool_large_alloc(struct pool *, int, int *);
-void pool_large_free(struct pool *, void *);
+void *pool_multi_alloc(struct pool *, int, int *);
+void pool_multi_free(struct pool *, void *);
-struct pool_allocator pool_allocator_large = {
- pool_large_alloc,
- pool_large_free
+struct pool_allocator pool_allocator_multi = {
+ pool_multi_alloc,
+ pool_multi_free
};
-void *pool_large_alloc_ni(struct pool *, int, int *);
-void pool_large_free_ni(struct pool *, void *);
+void *pool_multi_alloc_ni(struct pool *, int, int *);
+void pool_multi_free_ni(struct pool *, void *);
-struct pool_allocator pool_allocator_large_ni = {
- pool_large_alloc_ni,
- pool_large_free_ni
+struct pool_allocator pool_allocator_multi_ni = {
+ pool_multi_alloc_ni,
+ pool_multi_free_ni
};
#ifdef DDB
@@ -243,9 +242,9 @@ pool_init(struct pool *pp, size_t size,
if (pgsize > PAGE_SIZE) {
palloc = ISSET(flags, PR_WAITOK) ?
- &pool_allocator_large_ni : &pool_allocator_large;
+ &pool_allocator_multi_ni : &pool_allocator_multi;
} else
- palloc = &pool_allocator_nointr;
+ palloc = &pool_allocator_single;
} else
pgsize = palloc->pa_pagesz ? palloc->pa_pagesz : PAGE_SIZE;
@@ -1449,7 +1448,7 @@ pool_page_free(struct pool *pp, void *v)
}
void *
-pool_large_alloc(struct pool *pp, int flags, int *slowdown)
+pool_multi_alloc(struct pool *pp, int flags, int *slowdown)
{
struct kmem_va_mode kv = kv_intrsafe;
struct kmem_dyn_mode kd = KMEM_DYN_INITIALIZER;
@@ -1470,7 +1469,7 @@ pool_large_alloc(struct pool *pp, int fl
}
void
-pool_large_free(struct pool *pp, void *v)
+pool_multi_free(struct pool *pp, void *v)
{
struct kmem_va_mode kv = kv_intrsafe;
int s;
@@ -1484,7 +1483,7 @@ pool_large_free(struct pool *pp, void *v
}
void *
-pool_large_alloc_ni(struct pool *pp, int flags, int *slowdown)
+pool_multi_alloc_ni(struct pool *pp, int flags, int *slowdown)
{
struct kmem_va_mode kv = kv_any;
struct kmem_dyn_mode kd = KMEM_DYN_INITIALIZER;
@@ -1499,7 +1498,7 @@ pool_large_alloc_ni(struct pool *pp, int
}
void
-pool_large_free_ni(struct pool *pp, void *v)
+pool_multi_free_ni(struct pool *pp, void *v)
{
struct kmem_va_mode kv = kv_any;
Index: net/if_pppx.c
===================================================================
RCS file: /cvs/src/sys/net/if_pppx.c,v
retrieving revision 1.42
diff -u -p -r1.42 if_pppx.c
--- net/if_pppx.c 18 Jul 2015 15:51:16 -0000 1.42
+++ net/if_pppx.c 29 Aug 2015 21:31:59 -0000
@@ -248,7 +248,7 @@ pppxopen(dev_t dev, int flags, int mode,
if (LIST_EMPTY(&pppx_devs) && pppx_if_pl == NULL) {
pppx_if_pl = malloc(sizeof(*pppx_if_pl), M_DEVBUF, M_WAITOK);
pool_init(pppx_if_pl, sizeof(struct pppx_if), 0, 0, 0,
- "pppxif", &pool_allocator_nointr);
+ "pppxif", &pool_allocator_single);
}
pxd = malloc(sizeof(*pxd), M_DEVBUF, M_WAITOK | M_ZERO);
Index: net/pf_if.c
===================================================================
RCS file: /cvs/src/sys/net/pf_if.c,v
retrieving revision 1.79
diff -u -p -r1.79 pf_if.c
--- net/pf_if.c 21 Jul 2015 02:32:04 -0000 1.79
+++ net/pf_if.c 29 Aug 2015 21:31:59 -0000
@@ -89,7 +89,7 @@ pfi_initialize(void)
return;
pool_init(&pfi_addr_pl, sizeof(struct pfi_dynaddr), 0, 0, 0,
- "pfiaddrpl", &pool_allocator_nointr);
+ "pfiaddrpl", &pool_allocator_single);
pfi_buffer_max = 64;
pfi_buffer = mallocarray(pfi_buffer_max, sizeof(*pfi_buffer),
PFI_MTYPE, M_WAITOK);
Index: net/pf_ioctl.c
===================================================================
RCS file: /cvs/src/sys/net/pf_ioctl.c,v
retrieving revision 1.289
diff -u -p -r1.289 pf_ioctl.c
--- net/pf_ioctl.c 21 Jul 2015 02:32:04 -0000 1.289
+++ net/pf_ioctl.c 29 Aug 2015 21:31:59 -0000
@@ -140,7 +140,7 @@ pfattach(int num)
u_int32_t *timeout = pf_default_rule.timeout;
pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrule",
- &pool_allocator_nointr);
+ &pool_allocator_single);
pool_init(&pf_src_tree_pl, sizeof(struct pf_src_node), 0, 0, 0,
"pfsrctr", NULL);
pool_init(&pf_sn_item_pl, sizeof(struct pf_sn_item), 0, 0, 0,
Index: net/pf_osfp.c
===================================================================
RCS file: /cvs/src/sys/net/pf_osfp.c,v
retrieving revision 1.31
diff -u -p -r1.31 pf_osfp.c
--- net/pf_osfp.c 18 Jul 2015 19:19:00 -0000 1.31
+++ net/pf_osfp.c 29 Aug 2015 21:31:59 -0000
@@ -288,9 +288,9 @@ void
pf_osfp_initialize(void)
{
pool_init(&pf_osfp_entry_pl, sizeof(struct pf_osfp_entry), 0, 0, 0,
- "pfosfpen", &pool_allocator_nointr);
+ "pfosfpen", &pool_allocator_single);
pool_init(&pf_osfp_pl, sizeof(struct pf_os_fingerprint), 0, 0, 0,
- "pfosfp", &pool_allocator_nointr);
+ "pfosfp", &pool_allocator_single);
SLIST_INIT(&pf_osfp_list);
}
Index: nfs/nfs_syscalls.c
===================================================================
RCS file: /cvs/src/sys/nfs/nfs_syscalls.c,v
retrieving revision 1.103
diff -u -p -r1.103 nfs_syscalls.c
--- nfs/nfs_syscalls.c 15 Jul 2015 22:16:42 -0000 1.103
+++ nfs/nfs_syscalls.c 29 Aug 2015 21:31:59 -0000
@@ -547,7 +547,7 @@ nfsrv_init(int terminating)
if (!terminating)
pool_init(&nfsrv_descript_pl, sizeof(struct nfsrv_descript),
- 0, 0, 0, "ndscpl", &pool_allocator_nointr);
+ 0, 0, 0, "ndscpl", &pool_allocator_single);
}
#endif /* NFSSERVER */
Index: sys/pool.h
===================================================================
RCS file: /cvs/src/sys/sys/pool.h,v
retrieving revision 1.57
diff -u -p -r1.57 pool.h
--- sys/pool.h 10 Feb 2015 06:16:13 -0000 1.57
+++ sys/pool.h 29 Aug 2015 21:31:59 -0000
@@ -165,7 +165,7 @@ struct pool {
#ifdef _KERNEL
-extern struct pool_allocator pool_allocator_nointr;
+extern struct pool_allocator pool_allocator_single;
struct pool_request {
TAILQ_ENTRY(pool_request) pr_entry;
