Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pool_init() rather than pool_create().

Browse Source
This commit is contained in:
thorpej 2001-05-09 23:20:59 +00:00
parent c2214aaf3c
commit e2a791df22
2 changed files with 18 additions and 23 deletions
sys
arch/arm26/arm26
pmap.c
uvm
uvm_swap.c

12
sys/arch/arm26/arm26/pmap.c

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.28 2001/05/05 14:20:05 bjh21 Exp $ */
/* $NetBSD: pmap.c,v 1.29 2001/05/09 23:22:12 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@ -105,7 +105,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.28 2001/05/05 14:20:05 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.29 2001/05/09 23:22:12 thorpej Exp $");
#include <sys/kernel.h> /* for cold */
#include <sys/malloc.h>
@ -174,7 +174,7 @@ struct pmap kernel_pmap_store;
static boolean_t pmap_initialised = FALSE;
static struct pool *pmap_pool;
static struct pool pmap_pool;
static pmap_t active_pmap;
@ -340,7 +340,7 @@ pmap_init2()
PMAP_UNMAP_POOLPAGE((vaddr_t)old_pv_table)));
/* Create pmap pool */
pmap_pool = pool_create(sizeof(struct pmap), 0, 0, 0,
pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0,
"pmappool", 0, NULL, NULL, M_VMPMAP);
pmap_initialised = 1;
}
@ -354,7 +354,7 @@ pmap_create()
UVMHIST_CALLED(pmaphist);
if (!pmap_initialised)
pmap_init2();
pmap = pool_get(pmap_pool, PR_WAITOK);
pmap = pool_get(&pmap_pool, PR_WAITOK);
bzero(pmap, sizeof(*pmap));
pmap->pm_count = 1;
return pmap;
@ -379,7 +379,7 @@ pmap_destroy(pmap_t pmap)
if (pmap->pm_entries[i] != NULL)
panic("pmap_destroy: pmap isn't empty");
#endif
pool_put(pmap_pool, pmap);
pool_put(&pmap_pool, pmap);
}
long

29
sys/uvm/uvm_swap.c

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.c,v 1.48 2001/05/09 19:21:02 fvdl Exp $ */
/* $NetBSD: uvm_swap.c,v 1.49 2001/05/09 23:20:59 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Matthew R. Green
@ -177,27 +177,27 @@ struct vndbuf {
/*
* We keep a of pool vndbuf's and vndxfer structures.
*/
struct pool *vndxfer_pool;
struct pool *vndbuf_pool;
static struct pool vndxfer_pool;
static struct pool vndbuf_pool;
#define getvndxfer(vnx) do { \
int s = splbio(); \
vnx = pool_get(vndxfer_pool, PR_MALLOCOK|PR_WAITOK); \
vnx = pool_get(&vndxfer_pool, PR_MALLOCOK|PR_WAITOK); \
splx(s); \
} while (0)
#define putvndxfer(vnx) { \
pool_put(vndxfer_pool, (void *)(vnx)); \
pool_put(&vndxfer_pool, (void *)(vnx)); \
}
#define getvndbuf(vbp) do { \
int s = splbio(); \
vbp = pool_get(vndbuf_pool, PR_MALLOCOK|PR_WAITOK); \
vbp = pool_get(&vndbuf_pool, PR_MALLOCOK|PR_WAITOK); \
splx(s); \
} while (0)
#define putvndbuf(vbp) { \
pool_put(vndbuf_pool, (void *)(vbp)); \
pool_put(&vndbuf_pool, (void *)(vbp)); \
}
/* /dev/drum */
@ -276,17 +276,12 @@ uvm_swap_init()
* allocate pools for structures used for swapping to files.
*/
vndxfer_pool =
pool_create(sizeof(struct vndxfer), 0, 0, 0, "swp vnx", 0,
NULL, NULL, 0);
if (vndxfer_pool == NULL)
panic("swapinit: pool_create failed");
pool_init(&vndxfer_pool, sizeof(struct vndxfer), 0, 0, 0,
"swp vnx", 0, NULL, NULL, 0);
pool_init(&vndbuf_pool, sizeof(struct vndbuf), 0, 0, 0,
"swp vnd", 0, NULL, NULL, 0);
vndbuf_pool =
pool_create(sizeof(struct vndbuf), 0, 0, 0, "swp vnd", 0,
NULL, NULL, 0);
if (vndbuf_pool == NULL)
panic("swapinit: pool_create failed");
/*
* done!
*/