summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/alpha/alpha/pmap.c4
-rw-r--r--sys/amd64/amd64/pmap.c4
-rw-r--r--sys/i386/i386/pmap.c4
-rw-r--r--sys/ia64/ia64/pmap.c6
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/netinet/in_pcb.c4
-rw-r--r--sys/netinet6/in6_pcb.c2
-rw-r--r--sys/vm/vm_zone.c45
-rw-r--r--sys/vm/vm_zone.h3
9 files changed, 19 insertions, 57 deletions
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index ef32963..0dabed5 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -1638,7 +1638,7 @@ static PMAP_INLINE void
free_pv_entry(pv_entry_t pv)
{
pv_entry_count--;
- zfreei(pvzone, pv);
+ zfree(pvzone, pv);
}
/*
@@ -1657,7 +1657,7 @@ get_pv_entry(void)
pmap_pagedaemon_waken = 1;
wakeup (&vm_pages_needed);
}
- return zalloci(pvzone);
+ return zalloc(pvzone);
}
/*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index e60b5fb..b41dfb0 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1450,7 +1450,7 @@ free_pv_entry(pv)
pv_entry_t pv;
{
pv_entry_count--;
- zfreei(pvzone, pv);
+ zfree(pvzone, pv);
}
/*
@@ -1469,7 +1469,7 @@ get_pv_entry(void)
pmap_pagedaemon_waken = 1;
wakeup (&vm_pages_needed);
}
- return zalloci(pvzone);
+ return zalloc(pvzone);
}
/*
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index e60b5fb..b41dfb0 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1450,7 +1450,7 @@ free_pv_entry(pv)
pv_entry_t pv;
{
pv_entry_count--;
- zfreei(pvzone, pv);
+ zfree(pvzone, pv);
}
/*
@@ -1469,7 +1469,7 @@ get_pv_entry(void)
pmap_pagedaemon_waken = 1;
wakeup (&vm_pages_needed);
}
- return zalloci(pvzone);
+ return zalloc(pvzone);
}
/*
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 46cfca9..cd25efb 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -740,7 +740,7 @@ static PMAP_INLINE void
free_pv_entry(pv_entry_t pv)
{
pv_entry_count--;
- zfreei(pvzone, pv);
+ zfree(pvzone, pv);
}
/*
@@ -753,7 +753,7 @@ static pv_entry_t
get_pv_entry(void)
{
if (!pvinit)
- return zalloci(pvbootzone);
+ return zalloc(pvbootzone);
pv_entry_count++;
if (pv_entry_high_water &&
@@ -762,7 +762,7 @@ get_pv_entry(void)
pmap_pagedaemon_waken = 1;
wakeup (&vm_pages_needed);
}
- return (pv_entry_t) IA64_PHYS_TO_RR7(vtophys(zalloci(pvzone)));
+ return (pv_entry_t) IA64_PHYS_TO_RR7(vtophys(zalloc(pvzone)));
}
/*
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index fe78205..62459df 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -113,7 +113,7 @@ soalloc(waitok)
{
struct socket *so;
- so = zalloci(socket_zone);
+ so = zalloc(socket_zone);
if (so) {
/* XXX race condition for reentrant kernel */
bzero(so, sizeof *so);
@@ -211,7 +211,7 @@ sodealloc(so)
}
#endif
crfree(so->so_cred);
- zfreei(so->so_zone, so);
+ zfree(so->so_zone, so);
}
int
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 131b998..eccc778 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -147,7 +147,7 @@ in_pcballoc(so, pcbinfo, p)
{
register struct inpcb *inp;
- inp = zalloci(pcbinfo->ipi_zone);
+ inp = zalloc(pcbinfo->ipi_zone);
if (inp == NULL)
return (ENOBUFS);
bzero((caddr_t)inp, sizeof(*inp));
@@ -582,7 +582,7 @@ in_pcbdetach(inp)
}
ip_freemoptions(inp->inp_moptions);
inp->inp_vflag = 0;
- zfreei(ipi->ipi_zone, inp);
+ zfree(ipi->ipi_zone, inp);
}
/*
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index bc7b0cd..67409be 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -624,7 +624,7 @@ in6_pcbdetach(inp)
ip_freemoptions(inp->inp_moptions);
inp->inp_vflag = 0;
- zfreei(ipi->ipi_zone, inp);
+ zfree(ipi->ipi_zone, inp);
}
/*
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index bc843e0..57aeb10 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -39,6 +39,9 @@ static MALLOC_DEFINE(M_ZONE, "ZONE", "Zone header");
#define ZONE_ROUNDING 32
#define ZENTRY_FREE 0x12342378
+
+static void *_zget(vm_zone_t z);
+
/*
* void *zalloc(vm_zone_t zone) --
* Returns an item from a specified zone.
@@ -298,41 +301,11 @@ zunlock(vm_zone_t z, int s)
* void zfree(vm_zone_t zone, void *item) --
* Frees an item back to a specified zone.
*
- * void *zalloci(vm_zone_t zone) --
- * Returns an item from a specified zone, interrupt safe.
- *
- * void zfreei(vm_zone_t zone, void *item) --
- * Frees an item back to a specified zone, interrupt safe.
- *
*/
void *
zalloc(vm_zone_t z)
{
-#if defined(SMP)
- return zalloci(z);
-#else
- return _zalloc(z);
-#endif
-}
-
-void
-zfree(vm_zone_t z, void *item)
-{
-#ifdef SMP
- zfreei(z, item);
-#else
- _zfree(z, item);
-#endif
-}
-
-/*
- * Zone allocator/deallocator. These are interrupt / (or potentially SMP)
- * safe. The raw zalloc/zfree routines are not interrupt safe, but are fast.
- */
-void *
-zalloci(vm_zone_t z)
-{
int s;
void *item;
@@ -343,7 +316,7 @@ zalloci(vm_zone_t z)
}
void
-zfreei(vm_zone_t z, void *item)
+zfree(vm_zone_t z, void *item)
{
int s;
@@ -356,7 +329,7 @@ zfreei(vm_zone_t z, void *item)
/*
* Internal zone routine. Not to be called from external (non vm_zone) code.
*/
-void *
+static void *
_zget(vm_zone_t z)
{
int i;
@@ -405,24 +378,16 @@ _zget(vm_zone_t z)
if (lockstatus(&kernel_map->lock, NULL)) {
int s;
s = splvm();
-#ifdef SMP
simple_unlock(&z->zlock);
-#endif
item = (void *) kmem_malloc(kmem_map, nbytes, M_WAITOK);
-#ifdef SMP
simple_lock(&z->zlock);
-#endif
if (item != NULL)
zone_kmem_pages += z->zalloc;
splx(s);
} else {
-#ifdef SMP
simple_unlock(&z->zlock);
-#endif
item = (void *) kmem_alloc(kernel_map, nbytes);
-#ifdef SMP
simple_lock(&z->zlock);
-#endif
if (item != NULL)
zone_kern_pages += z->zalloc;
}
diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h
index 2b21586..359f729 100644
--- a/sys/vm/vm_zone.h
+++ b/sys/vm/vm_zone.h
@@ -51,10 +51,7 @@ int zinitna __P((vm_zone_t z, struct vm_object *obj, char *name,
int size, int nentries, int flags, int zalloc));
void * zalloc __P((vm_zone_t z));
void zfree __P((vm_zone_t z, void *item));
-void * zalloci __P((vm_zone_t z));
-void zfreei __P((vm_zone_t z, void *item));
void zbootinit __P((vm_zone_t z, char *name, int size, void *item,
int nitems));
-void * _zget __P((vm_zone_t z));
#endif /* _SYS_ZONE_H */
OpenPOWER on IntegriCloud