- Take advantage of the M_ZERO flag that can now be passed to uma_zalloc.

- Remove atm_uma_ctor() as the M_ZERO will zero out the memory for us.

3 files changed, 4 insertions, 15 deletions

diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index d8dccef..ff6b34b 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -709,7 +709,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get an attribute block and save listening attributes
 	 */
-	cop->co_lattr = uma_zalloc(atm_attributes_zone, 0);
+	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_ZERO);
 	if (cop->co_lattr == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 57765f0..edc2b8e 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -124,14 +124,14 @@ atm_initialize()
 	atmintrq_present = 1;
 
 	atm_attributes_zone = uma_zcreate("atm attributes",
-	    sizeof(Atm_attributes), (uma_ctor)&atm_uma_ctor, NULL, NULL, NULL,
+	    sizeof(Atm_attributes), NULL, NULL, NULL, NULL,
 	    UMA_ALIGN_PTR, 0);
 	if (atm_attributes_zone == NULL)
 		panic("atm_initialize: unable to create attributes zone");
 	uma_zone_set_max(atm_attributes_zone, 100);
 
 	atm_stackq_zone = uma_zcreate("atm stackq", sizeof(struct stackq_entry),
-	    (uma_ctor)&atm_uma_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	if (atm_stackq_zone == NULL)
 		panic("atm_initialize: unable to create stackq zone");
 	uma_zone_set_max(atm_stackq_zone, 10);
@@ -491,16 +491,6 @@ atm_release_pool(sip)
 }
 
 /*
- * Zero fill constructor for our uma_zone's.
- */
-void
-atm_uma_ctor(void *mem, int size)
-{
-
-	bzero(mem, size);
-}
-
-/*
  * Handle timer tick expiration
  * 
  * Decrement tick count in first block on timer queue.  If there
@@ -747,7 +737,7 @@ atm_stack_enq(cmd, func, token, cvp, arg1, arg2)
 	/*
 	 * Get a new queue entry for this call
 	 */
-	sqp = uma_zalloc(atm_stackq_zone, 0);
+	sqp = uma_zalloc(atm_stackq_zone, M_ZERO);
 	if (sqp == NULL) {
 		(void) splx(s);
 		return (ENOMEM);
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index eb7ee35..b681950 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -168,7 +168,6 @@ void		atm_initialize(void);
 void *		atm_allocate(struct sp_info *);
 void		atm_free(void *);
 void		atm_release_pool(struct sp_info *);
-void		atm_uma_ctor(void *, int);
 void		atm_timeout(struct atm_time *, int, 
 			void (*)(struct atm_time *) );
 int		atm_untimeout(struct atm_time *);