summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_counter.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2014-03-04 14:46:30 +0000
committerglebius <glebius@FreeBSD.org>2014-03-04 14:46:30 +0000
commit8a9528c4d0ec97d5f0c55b27a51613851b619e04 (patch)
tree256bb459a422081d6ab540f11d785e1f0efa5449 /sys/kern/subr_counter.c
parentd06eb27738c9003bba69ae1f38b8b5addeb568dd (diff)
downloadFreeBSD-src-8a9528c4d0ec97d5f0c55b27a51613851b619e04.zip
FreeBSD-src-8a9528c4d0ec97d5f0c55b27a51613851b619e04.tar.gz
Merge r261722, r261723, r261724, r261725 from head:
several minor improvements for UMA_ZPCPU_ZONE zones.
Diffstat (limited to 'sys/kern/subr_counter.c')
-rw-r--r--sys/kern/subr_counter.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/kern/subr_counter.c b/sys/kern/subr_counter.c
index b3ddc7a..ea2759c 100644
--- a/sys/kern/subr_counter.c
+++ b/sys/kern/subr_counter.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
#define IN_SUBR_COUNTER_C
#include <sys/counter.h>
-static uma_zone_t uint64_pcpu_zone;
-
void
counter_u64_zero(counter_u64_t c)
{
@@ -62,7 +60,7 @@ counter_u64_alloc(int flags)
{
counter_u64_t r;
- r = uma_zalloc(uint64_pcpu_zone, flags);
+ r = uma_zalloc(pcpu_zone_64, flags);
if (r != NULL)
counter_u64_zero(r);
@@ -73,7 +71,7 @@ void
counter_u64_free(counter_u64_t c)
{
- uma_zfree(uint64_pcpu_zone, c);
+ uma_zfree(pcpu_zone_64, c);
}
int
@@ -96,12 +94,3 @@ sysctl_handle_counter_u64(SYSCTL_HANDLER_ARGS)
return (0);
}
-
-static void
-counter_startup(void)
-{
-
- uint64_pcpu_zone = uma_zcreate("uint64 pcpu", sizeof(uint64_t),
- NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU);
-}
-SYSINIT(counter, SI_SUB_KMEM, SI_ORDER_ANY, counter_startup, NULL);
OpenPOWER on IntegriCloud