kernel: Replace some bzero()s with M_ZERO in the preceding kmalloc().

diff --git a/sys/dev/raid/twa/tw_osl_freebsd.c b/sys/dev/raid/twa/tw_osl_freebsd.c
index cbe098c..afd3973 100644 (file)
--- a/sys/dev/raid/twa/tw_osl_freebsd.c
+++ b/sys/dev/raid/twa/tw_osl_freebsd.c
@@ -703,7 +703,8 @@ tw_osli_alloc_mem(struct twa_softc *sc)
        if ((sc->req_ctx_buf = (struct tw_osli_req_context *)
                        kmalloc((sizeof(struct tw_osli_req_context) *
                                TW_OSLI_MAX_NUM_REQUESTS),
-                               TW_OSLI_MALLOC_CLASS, M_WAITOK)) == NULL) {
+                               TW_OSLI_MALLOC_CLASS,
+                               M_WAITOK | M_ZERO)) == NULL) {
                tw_osli_printf(sc, "error = %d",
                        TW_CL_SEVERITY_ERROR_STRING,
                        TW_CL_MESSAGE_SOURCE_FREEBSD_DRIVER,
@@ -712,9 +713,6 @@ tw_osli_alloc_mem(struct twa_softc *sc)
                        ENOMEM);
                return(ENOMEM);
        }
-       bzero(sc->req_ctx_buf,
-               sizeof(struct tw_osli_req_context) * TW_OSLI_MAX_NUM_REQUESTS);
-
        for (i = 0; i < TW_OSLI_MAX_NUM_REQUESTS; i++) {
                req = &(sc->req_ctx_buf[i]);
                req->ctlr = sc;

diff --git a/sys/dev/raid/tws/tws_cam.c b/sys/dev/raid/tws/tws_cam.c
index fde1171..6f99c15 100644 (file)
--- a/sys/dev/raid/tws/tws_cam.c
+++ b/sys/dev/raid/tws/tws_cam.c
@@ -841,10 +841,9 @@ tws_send_scsi_cmd(struct tws_softc *sc, int cmd)
     cmd_pkt->cmd.pkt_a.cdb[4] = 128;
 
     req->length = TWS_SECTOR_SIZE;
-    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT);
+    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT | M_ZERO);
     if ( req->data == NULL )
         return(ENOMEM);
-    bzero(req->data, TWS_SECTOR_SIZE);
     req->flags = TWS_DIR_IN;
 
     callout_reset(&req->thandle, (TWS_IO_TIMEOUT * hz), tws_timeout, req);
@@ -870,10 +869,9 @@ tws_set_param(struct tws_softc *sc, u_int32_t table_id, u_int32_t param_id,
     }
 
     req->length = TWS_SECTOR_SIZE;
-    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT);
+    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT | M_ZERO);
     if ( req->data == NULL )
         return(ENOMEM);
-    bzero(req->data, TWS_SECTOR_SIZE);
     param = (struct tws_getset_param *)req->data;
 
     req->cb = tws_getset_param_complete;
@@ -920,10 +918,9 @@ tws_get_param(struct tws_softc *sc, u_int32_t table_id, u_int32_t param_id,
     }
 
     req->length = TWS_SECTOR_SIZE;
-    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT);
+    req->data = kmalloc(TWS_SECTOR_SIZE, M_TWS, M_NOWAIT | M_ZERO);
     if ( req->data == NULL )
         return(FAILURE);
-    bzero(req->data, TWS_SECTOR_SIZE);
     param = (struct tws_getset_param *)req->data;
 
     req->cb = NULL;

diff --git a/sys/kern/subr_alist.c b/sys/kern/subr_alist.c
index a2bb0f7..cc9b17e 100644 (file)
--- a/sys/kern/subr_alist.c
+++ b/sys/kern/subr_alist.c
@@ -34,8 +34,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $DragonFly: src/sys/kern/subr_alist.c,v 1.4 2008/04/23 17:21:08 dillon Exp $
  */
 /*
  * This module has been adapted from the BLIST module, which was written
@@ -157,9 +155,7 @@ alist_create(daddr_t blocks, struct malloc_type *mtype)
                skip = (skip + 1) * ALIST_META_RADIX;
        }
 
-       bl = kmalloc(sizeof(struct alist), mtype, M_WAITOK);
-
-       bzero(bl, sizeof(*bl));
+       bl = kmalloc(sizeof(struct alist), mtype, M_WAITOK | M_ZERO);
 
        bl->bl_blocks = blocks;
        bl->bl_radix = radix;

diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 670dbde..410e152 100644 (file)
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -94,7 +94,6 @@
  *     This code can be compiled stand-alone for debugging.
  *
  * $FreeBSD: src/sys/kern/subr_blist.c,v 1.5.2.2 2003/01/12 09:23:12 dillon Exp $
- * $DragonFly: src/sys/kern/subr_blist.c,v 1.8 2008/08/10 22:09:50 dillon Exp $
  */
 
 #ifdef _KERNEL
@@ -187,9 +186,7 @@ blist_create(swblk_t blocks)
                KKASSERT(skip > 0);
        }
 
-       bl = kmalloc(sizeof(struct blist), M_SWAP, M_WAITOK);
-
-       bzero(bl, sizeof(*bl));
+       bl = kmalloc(sizeof(struct blist), M_SWAP, M_WAITOK | M_ZERO);
 
        bl->bl_blocks = blocks;
        bl->bl_radix = radix;

diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index c625fb1..dc9c956 100644 (file)
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -32,7 +32,6 @@
  *
  *     @(#)subr_prof.c 8.3 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/kern/subr_prof.c,v 1.32.2.2 2000/08/03 00:09:32 ps Exp $
- * $DragonFly: src/sys/kern/subr_prof.c,v 1.16 2007/01/06 03:23:18 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -115,12 +114,11 @@ kmstartup(void *dummy)
                p->tolimit = MAXARCS;
        p->tossize = p->tolimit * sizeof(struct tostruct);
        cp = (char *)kmalloc(p->kcountsize + p->fromssize + p->tossize,
-           M_GPROF, M_NOWAIT);
+           M_GPROF, M_NOWAIT | M_ZERO);
        if (cp == 0) {
                kprintf("No memory for profiling.\n");
                return;
        }
-       bzero(cp, p->kcountsize + p->tossize + p->fromssize);
        p->tos = (struct tostruct *)cp;
        cp += p->tossize;
        p->kcount = (HISTCOUNTER *)cp;

diff --git a/sys/net/pf/pf_norm.c b/sys/net/pf/pf_norm.c
index f55df1a..b654c4f 100644 (file)
--- a/sys/net/pf/pf_norm.c
+++ b/sys/net/pf/pf_norm.c
@@ -1354,10 +1354,10 @@ pf_normalize_tcp_init(struct mbuf *m, int off, struct pf_pdesc *pd,
        KASSERT((src->scrub == NULL), 
            ("pf_normalize_tcp_init: src->scrub != NULL"));
 
-       src->scrub = kmalloc(sizeof(struct pf_state_scrub), M_PFSTATESCRUBPL, M_NOWAIT);
+       src->scrub = kmalloc(sizeof(struct pf_state_scrub), M_PFSTATESCRUBPL,
+           M_NOWAIT | M_ZERO);
        if (src->scrub == NULL)
                return (1);
-       bzero(src->scrub, sizeof(*src->scrub));
 
        switch (pd->af) {
 #ifdef INET