Convert more malloc+bzero to malloc+M_ZERO.

Submitted by:	josh@zipperup.org
Submitted by:	Robert Drehmel <robd@gmx.net>

37 files changed, 89 insertions, 144 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index dfbc3ac..9acc402 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -397,8 +397,7 @@ arattach_pci(int unit, vm_offset_t mem_addr)
 	struct ar_hardc *hc;
 	u_int i, tmp;
 
-	hc = malloc(sizeof(struct ar_hardc), M_DEVBUF, M_WAITOK);
-	bzero(hc, sizeof(struct ar_hardc));
+	hc = malloc(sizeof(struct ar_hardc), M_DEVBUF, M_WAITOK | M_ZERO);
 
 	hc->cunit = unit;
 	hc->mem_start = (caddr_t)mem_addr;
@@ -1139,11 +1138,10 @@ arc_init(struct ar_hardc *hc)
 	u_int descneeded;
 	u_char isr, mar;
 
-	MALLOC(sc, struct ar_softc *,
-		hc->numports * sizeof(struct ar_softc), M_DEVBUF, M_WAITOK);
+	MALLOC(sc, struct ar_softc *, hc->numports * sizeof(struct ar_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sc == NULL)
 		return;
-	bzero(sc, hc->numports * sizeof(struct ar_softc));
 	hc->sc = sc;
 
 	hc->txc_dtr[0] = AR_TXC_DTR_NOTRESET |
@@ -2234,12 +2232,11 @@ ngar_rcvmsg(node_p node, struct ng_mesg *msg,
 			    int pos = 0;
 			    int resplen = sizeof(struct ng_mesg) + 512;
 			    MALLOC(*resp, struct ng_mesg *, resplen,
-					M_NETGRAPH, M_NOWAIT);
+					M_NETGRAPH, M_NOWAIT | M_ZERO);
 			    if (*resp == NULL) { 
 				error = ENOMEM;
 				break;
 			    }       
-			    bzero(*resp, resplen);
 			    arg = (*resp)->data;
 
 			    /*
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index dfbc3ac..9acc402 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -397,8 +397,7 @@ arattach_pci(int unit, vm_offset_t mem_addr)
 	struct ar_hardc *hc;
 	u_int i, tmp;
 
-	hc = malloc(sizeof(struct ar_hardc), M_DEVBUF, M_WAITOK);
-	bzero(hc, sizeof(struct ar_hardc));
+	hc = malloc(sizeof(struct ar_hardc), M_DEVBUF, M_WAITOK | M_ZERO);
 
 	hc->cunit = unit;
 	hc->mem_start = (caddr_t)mem_addr;
@@ -1139,11 +1138,10 @@ arc_init(struct ar_hardc *hc)
 	u_int descneeded;
 	u_char isr, mar;
 
-	MALLOC(sc, struct ar_softc *,
-		hc->numports * sizeof(struct ar_softc), M_DEVBUF, M_WAITOK);
+	MALLOC(sc, struct ar_softc *, hc->numports * sizeof(struct ar_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (sc == NULL)
 		return;
-	bzero(sc, hc->numports * sizeof(struct ar_softc));
 	hc->sc = sc;
 
 	hc->txc_dtr[0] = AR_TXC_DTR_NOTRESET |
@@ -2234,12 +2232,11 @@ ngar_rcvmsg(node_p node, struct ng_mesg *msg,
 			    int pos = 0;
 			    int resplen = sizeof(struct ng_mesg) + 512;
 			    MALLOC(*resp, struct ng_mesg *, resplen,
-					M_NETGRAPH, M_NOWAIT);
+					M_NETGRAPH, M_NOWAIT | M_ZERO);
 			    if (*resp == NULL) { 
 				error = ENOMEM;
 				break;
 			    }       
-			    bzero(*resp, resplen);
 			    arg = (*resp)->data;
 
 			    /*
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index de5d17f..b14cfdb 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -356,17 +356,14 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 		fkeymap_size =
 			sizeof(default_fkeytab)/sizeof(default_fkeytab[0]);
 	} else if (*kbdp == NULL) {
-		*kbdp = kbd = malloc(sizeof(*kbd), M_DEVBUF, M_NOWAIT);
-		if (kbd == NULL)
-			return ENOMEM;
-		bzero(kbd, sizeof(*kbd));
-		state = malloc(sizeof(*state), M_DEVBUF, M_NOWAIT);
+		*kbdp = kbd = malloc(sizeof(*kbd), M_DEVBUF, M_NOWAIT | M_ZERO);
+		state = malloc(sizeof(*state), M_DEVBUF, M_NOWAIT | M_ZERO);
 		keymap = malloc(sizeof(key_map), M_DEVBUF, M_NOWAIT);
 		accmap = malloc(sizeof(accent_map), M_DEVBUF, M_NOWAIT);
 		fkeymap = malloc(sizeof(fkey_tab), M_DEVBUF, M_NOWAIT);
 		fkeymap_size = sizeof(fkey_tab)/sizeof(fkey_tab[0]);
-		if ((state == NULL) || (keymap == NULL) || (accmap == NULL)
-		     || (fkeymap == NULL)) {
+		if ((kbd == NULL) || (state == NULL) || (keymap == NULL)
+		     || (accmap == NULL) || (fkeymap == NULL)) {
 			if (state != NULL)
 				free(state, M_DEVBUF);
 			if (keymap != NULL)
@@ -375,10 +372,10 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 				free(accmap, M_DEVBUF);
 			if (fkeymap != NULL)
 				free(fkeymap, M_DEVBUF);
-			free(kbd, M_DEVBUF);
+			if (kbd == NULL)
+				free(kbd, M_DEVBUF);
 			return ENOMEM;
 		}
-		bzero(state, sizeof(*state));
 	} else if (KBD_IS_INITIALIZED(*kbdp) && KBD_IS_CONFIGURED(*kbdp)) {
 		return 0;
 	} else {
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index 7db3d8d..fdf5bf8 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -111,10 +111,9 @@ atkbdc_softc_t
 	sc = atkbdc_softc[unit];
 	if (sc == NULL) {
 		sc = atkbdc_softc[unit]
-		   = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
+		   = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (sc == NULL)
 			return NULL;
-		bzero(sc, sizeof(*sc));
 	}
 	return sc;
 }
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index e8c3e4c..d99b648 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -146,10 +146,10 @@ atkbdc_add_device(device_t dev, const char *name, int unit)
 	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
 		return;
 
-	kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT);
+	kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
+		M_NOWAIT | M_ZERO);
 	if (!kdev)
 		return;
-	bzero(kdev, sizeof *kdev);
 
 	if (resource_int_value(name, unit, "irq", &t) == 0)
 		kdev->irq = t;
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index e8c3e4c..d99b648 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -146,10 +146,10 @@ atkbdc_add_device(device_t dev, const char *name, int unit)
 	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
 		return;
 
-	kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT);
+	kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV,
+		M_NOWAIT | M_ZERO);
 	if (!kdev)
 		return;
-	bzero(kdev, sizeof *kdev);
 
 	if (resource_int_value(name, unit, "irq", &t) == 0)
 		kdev->irq = t;
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 7b06a89..cdd07ce 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -598,8 +598,8 @@ ccdinterleave(cs, unit)
 	 * Chances are this is too big, but we don't care.
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
-	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_DEVBUF, M_WAITOK);
-	bzero((caddr_t)cs->sc_itable, size);
+	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 4006807..18245e3 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -553,10 +553,9 @@ cyattach_common(cy_iobase, cy_align)
 			struct com_s	*com;
 			int		s;
 
-	com = malloc(sizeof *com, M_DEVBUF, M_NOWAIT);
+	com = malloc(sizeof *com, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (com == NULL)
 		break;
-	bzero(com, sizeof *com);
 	com->unit = unit;
 			com->gfrcr_image = firmware_version;
 			if (CY_RTS_DTR_SWAPPED(firmware_version)) {
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 4006807..18245e3 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -553,10 +553,9 @@ cyattach_common(cy_iobase, cy_align)
 			struct com_s	*com;
 			int		s;
 
-	com = malloc(sizeof *com, M_DEVBUF, M_NOWAIT);
+	com = malloc(sizeof *com, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (com == NULL)
 		break;
-	bzero(com, sizeof *com);
 	com->unit = unit;
 			com->gfrcr_image = firmware_version;
 			if (CY_RTS_DTR_SWAPPED(firmware_version)) {
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 1e9dcda..a781251 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -173,12 +173,11 @@ eisa_probe(device_t dev)
 
 		/* Prepare an eisa_device_node for this slot */
 		e_dev = (struct eisa_device *)malloc(sizeof(*e_dev),
-						     M_DEVBUF, M_NOWAIT);
+						     M_DEVBUF, M_NOWAIT|M_ZERO);
 		if (!e_dev) {
 			device_printf(dev, "cannot malloc eisa_device");
 			break; /* Try to attach what we have already */
 		}
-		bzero(e_dev, sizeof(*e_dev));
 
 		e_dev->id = eisa_id;
 
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 72d63d9..0c354c1 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -82,17 +82,16 @@ vid_realloc_array(void)
 
 	s = spltty();
 	newsize = ((adapters + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
-	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK);
-	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF, M_WAITOK);
+	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK | M_ZERO);
+	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 #ifdef FB_INSTALL_CDEV
-	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF, M_WAITOK);
+	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 #endif
-	bzero(new_adp, sizeof(*new_adp)*newsize);
-	bzero(new_vidsw, sizeof(*new_vidsw)*newsize);
 	bcopy(adapter, new_adp, sizeof(*adapter)*adapters);
 	bcopy(vidsw, new_vidsw, sizeof(*vidsw)*adapters);
 #ifdef FB_INSTALL_CDEV
-	bzero(new_cdevsw, sizeof(*new_cdevsw)*newsize);
 	bcopy(vidcdevsw, new_cdevsw, sizeof(*vidcdevsw)*adapters);
 #endif
 	if (adapters > 1) {
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index e82bbd5..4fee4f5 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -818,10 +818,9 @@ fdc_add_child(device_t dev, const char *name, int unit)
 	struct fdc_ivars *ivar;
 	device_t child;
 
-	ivar = malloc(sizeof *ivar, M_DEVBUF /* XXX */, M_NOWAIT);
+	ivar = malloc(sizeof *ivar, M_DEVBUF /* XXX */, M_NOWAIT | M_ZERO);
 	if (ivar == NULL)
 		return;
-	bzero(ivar, sizeof *ivar);
 	if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0)
 		ivar->fdunit = 0;
 	child = device_add_child(dev, name, unit);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 6544f56..13cd0fd 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -587,15 +587,14 @@ fxp_attach_common(sc, enaddr)
 	DELAY(10);
 
 	sc->cbl_base = malloc(sizeof(struct fxp_cb_tx) * FXP_NTXCB,
-	    M_DEVBUF, M_NOWAIT);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc->cbl_base == NULL)
 		goto fail;
-	bzero(sc->cbl_base, sizeof(struct fxp_cb_tx) * FXP_NTXCB);
 
-	sc->fxp_stats = malloc(sizeof(struct fxp_stats), M_DEVBUF, M_NOWAIT);
+	sc->fxp_stats = malloc(sizeof(struct fxp_stats), M_DEVBUF,
+	    M_NOWAIT | M_ZERO);
 	if (sc->fxp_stats == NULL)
 		goto fail;
-	bzero(sc->fxp_stats, sizeof(struct fxp_stats));
 
 	sc->mcsp = malloc(sizeof(struct fxp_cb_mcs), M_DEVBUF, M_NOWAIT);
 	if (sc->mcsp == NULL)
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 8b8d2a4..83396ae 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -191,10 +191,10 @@ ida_init(struct ida_softc *ida)
         bioq_init(&ida->bio_queue);
 
 	ida->qcbs = (struct ida_qcb *)
-	    malloc(IDA_QCB_MAX * sizeof(struct ida_qcb), M_DEVBUF, M_NOWAIT);
+	    malloc(IDA_QCB_MAX * sizeof(struct ida_qcb), M_DEVBUF,
+		M_NOWAIT | M_ZERO);
 	if (ida->qcbs == NULL)
 		return (ENOMEM);
-	bzero(ida->qcbs, IDA_QCB_MAX * sizeof(struct ida_qcb));
 
 	/*
 	 * Create our DMA tags
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 683ac4a..b559906 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -317,12 +317,11 @@ isp_pci_attach(device_t dev)
 		}
 	}
 
-	pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT);
+	pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (pcs == NULL) {
 		device_printf(dev, "cannot allocate softc\n");
 		return (ENOMEM);
 	}
-	bzero(pcs, sizeof (struct isp_pcisoftc));
 
 	/*
 	 * Figure out which we should try first - memory mapping or i/o mapping?
@@ -443,12 +442,11 @@ isp_pci_attach(device_t dev)
 		    PCI_MBOX_REGS2100_OFF;
 	}
 	isp = &pcs->pci_isp;
-	isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT);
+	isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (isp->isp_param == NULL) {
 		device_printf(dev, "cannot allocate parameter data\n");
 		goto bad;
 	}
-	bzero(isp->isp_param, psize);
 	isp->isp_mdvec = mdvp;
 	isp->isp_type = basetype;
 	isp->isp_revision = pci_get_revid(dev);
@@ -850,12 +848,11 @@ isp_pci_mbxdma(struct ispsoftc *isp)
 	}
 
 	len = sizeof (XS_T **) * isp->isp_maxcmds;
-	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK);
+	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		return (1);
 	}
-	bzero(isp->isp_xflist, len);
 	len = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
 	pci->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF,  M_WAITOK);
 	if (pci->dmaps == NULL) {
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index de5d17f..b14cfdb 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -356,17 +356,14 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 		fkeymap_size =
 			sizeof(default_fkeytab)/sizeof(default_fkeytab[0]);
 	} else if (*kbdp == NULL) {
-		*kbdp = kbd = malloc(sizeof(*kbd), M_DEVBUF, M_NOWAIT);
-		if (kbd == NULL)
-			return ENOMEM;
-		bzero(kbd, sizeof(*kbd));
-		state = malloc(sizeof(*state), M_DEVBUF, M_NOWAIT);
+		*kbdp = kbd = malloc(sizeof(*kbd), M_DEVBUF, M_NOWAIT | M_ZERO);
+		state = malloc(sizeof(*state), M_DEVBUF, M_NOWAIT | M_ZERO);
 		keymap = malloc(sizeof(key_map), M_DEVBUF, M_NOWAIT);
 		accmap = malloc(sizeof(accent_map), M_DEVBUF, M_NOWAIT);
 		fkeymap = malloc(sizeof(fkey_tab), M_DEVBUF, M_NOWAIT);
 		fkeymap_size = sizeof(fkey_tab)/sizeof(fkey_tab[0]);
-		if ((state == NULL) || (keymap == NULL) || (accmap == NULL)
-		     || (fkeymap == NULL)) {
+		if ((kbd == NULL) || (state == NULL) || (keymap == NULL)
+		     || (accmap == NULL) || (fkeymap == NULL)) {
 			if (state != NULL)
 				free(state, M_DEVBUF);
 			if (keymap != NULL)
@@ -375,10 +372,10 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 				free(accmap, M_DEVBUF);
 			if (fkeymap != NULL)
 				free(fkeymap, M_DEVBUF);
-			free(kbd, M_DEVBUF);
+			if (kbd == NULL)
+				free(kbd, M_DEVBUF);
 			return ENOMEM;
 		}
-		bzero(state, sizeof(*state));
 	} else if (KBD_IS_INITIALIZED(*kbdp) && KBD_IS_CONFIGURED(*kbdp)) {
 		return 0;
 	} else {
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 7db3d8d..fdf5bf8 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -111,10 +111,9 @@ atkbdc_softc_t
 	sc = atkbdc_softc[unit];
 	if (sc == NULL) {
 		sc = atkbdc_softc[unit]
-		   = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
+		   = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (sc == NULL)
 			return NULL;
-		bzero(sc, sizeof(*sc));
 	}
 	return sc;
 }
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 3dc4861..777e6f1 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -80,19 +80,18 @@ kbd_realloc_array(void)
 
 	s = spltty();
 	newsize = ((keyboards + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
-	new_kbd = malloc(sizeof(*new_kbd)*newsize, M_DEVBUF, M_NOWAIT);
+	new_kbd = malloc(sizeof(*new_kbd)*newsize, M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (new_kbd == NULL) {
 		splx(s);
 		return ENOMEM;
 	}
-	new_kbdsw = malloc(sizeof(*new_kbdsw)*newsize, M_DEVBUF, M_NOWAIT);
+	new_kbdsw = malloc(sizeof(*new_kbdsw)*newsize, M_DEVBUF,
+			    M_NOWAIT|M_ZERO);
 	if (new_kbdsw == NULL) {
 		free(new_kbd, M_DEVBUF);
 		splx(s);
 		return ENOMEM;
 	}
-	bzero(new_kbd, sizeof(*new_kbd)*newsize);
-	bzero(new_kbdsw, sizeof(*new_kbdsw)*newsize);
 	bcopy(keyboard, new_kbd, sizeof(*keyboard)*keyboards);
 	bcopy(kbdsw, new_kbdsw, sizeof(*kbdsw)*keyboards);
 	if (keyboards > 1) {
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index a6c91a9..cf220f7 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -1342,12 +1342,11 @@ ng_lmc_rcvmsg(node_p node, struct ng_mesg *msg,
 			int pos = 0;
 			int resplen = sizeof(struct ng_mesg) + 512;
 			MALLOC(resp, struct ng_mesg *, resplen, M_NETGRAPH,
-			       M_NOWAIT);
+			       M_NOWAIT | M_ZERO);
 			if (resp == NULL) {
 				error = ENOMEM;
 				break;
 			}
-			bzero(resp, resplen);
 			arg = (resp)->data;
 
 			/*
diff --git a/sys/dev/lmc/if_lmc_fbsd3.c b/sys/dev/lmc/if_lmc_fbsd3.c
index ce7c947..f6f9bf9 100644
--- a/sys/dev/lmc/if_lmc_fbsd3.c
+++ b/sys/dev/lmc/if_lmc_fbsd3.c
@@ -137,10 +137,9 @@ lmc_pci_attach(pcici_t config_id, int unit)
 	/*
 	 * allocate memory for the softc
 	 */
-	sc = (lmc_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
+	sc = (lmc_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return;
-	bzero(sc, sizeof(*sc));				/* Zero out the softc*/
 
 	revinfo  = PCI_CONF_READ(PCI_CFRV) & 0xFF;
 	id       = PCI_CONF_READ(PCI_CFID);
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 2c49264..c69716d 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -104,11 +104,9 @@ lnc_pci_attach(config_id, unit)
 	data |= PCIM_CMD_PORTEN | PCIM_CMD_BUSMASTEREN;
 	pci_cfgwrite(config_id, PCIR_COMMAND, data, 4);
 
-	sc = malloc(sizeof *sc, M_DEVBUF, M_NOWAIT);
+	sc = malloc(sizeof *sc, M_DEVBUF, M_NOWAIT | M_ZERO);
 
 	if (sc) {
-		bzero (sc, sizeof *sc);
-
 		sc->rap = iobase + PCNET_RAP;
 		sc->rdp = iobase + PCNET_RDP;
 		sc->bdp = iobase + PCNET_BDP;
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 9314af8..170ed72 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -257,8 +257,7 @@ mdstrategy_malloc(struct bio *bp)
 						*secpp = (u_char *)(uintptr_t)uc;
 				} else {
 					if (!secpp) {
-						MALLOC(secpp, u_char **, (secno + nsec + 1) * sizeof(u_char *), M_MD, M_WAITOK);
-						bzero(secpp, (secno + nsec + 1) * sizeof(u_char *));
+						MALLOC(secpp, u_char **, (secno + nsec + 1) * sizeof(u_char *), M_MD, M_WAITOK | M_ZERO);
 						bcopy(sc->secp, secpp, sc->nsecp * sizeof(u_char *));
 						FREE(sc->secp, M_MD);
 						sc->secp = secpp;
@@ -356,8 +355,7 @@ mdcreate(int unit)
 		if (sc->unit == unit)
 			return (NULL);
 	}
-	MALLOC(sc, struct md_s *,sizeof(*sc), M_MD, M_WAITOK);
-	bzero(sc, sizeof(*sc));
+	MALLOC(sc, struct md_s *,sizeof(*sc), M_MD, M_WAITOK | M_ZERO);
 	LIST_INSERT_HEAD(&md_softc_list, sc, list);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);
@@ -397,8 +395,7 @@ mdcreate_malloc(int unit)
 	sc->type = MD_MALLOC;
 
 	sc->nsect = MD_NSECT;	/* for now */
-	MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK);
-	bzero(sc->secp, sizeof(u_char *));
+	MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK | M_ZERO);
 	sc->nsecp = 1;
 	printf("md%d: Malloc disk\n", sc->unit);
 }
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 76ed767..fa11689 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -1012,8 +1012,7 @@ musycc_newhook(node_p node, hook_p hook, const char *name)
 		return (EINVAL);
 		
 	if (sc->chan[chan] == NULL) {
-		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_WAITOK);
-		bzero(sch, sizeof(*sch));
+		MALLOC(sch, struct schan *, sizeof(*sch), M_MUSYCC, M_WAITOK | M_ZERO);
 		sch->sc = sc;
 		sch->state = DOWN;
 		sch->chan = chan;
@@ -1340,8 +1339,7 @@ musycc_attach(device_t self)
 	f = pci_get_function(self);
 	/* For function zero allocate a csoftc */
 	if (f == 0) {
-		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_WAITOK);
-		bzero(csc, sizeof(*csc));
+		MALLOC(csc, struct csoftc *, sizeof(*csc), M_MUSYCC, M_WAITOK | M_ZERO);
 		csc->bus = pci_get_bus(self);
 		csc->slot = pci_get_slot(self);
 		LIST_INSERT_HEAD(&sc_list, csc, list);
@@ -1415,8 +1413,7 @@ musycc_attach(device_t self)
 		sc->reg = (struct globalr *)
 		    (csc->virbase[0] + i * 0x800);
 		MALLOC(sc->mycg, struct mycg *, 
-		    sizeof(struct mycg), M_MUSYCC, M_WAITOK);
-		bzero(sc->mycg, sizeof(struct mycg));
+		    sizeof(struct mycg), M_MUSYCC, M_WAITOK | M_ZERO);
 		sc->ram = &sc->mycg->cg;
 
 		error = ng_make_node_common(&ngtypestruct, &sc->node);
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 865ee5c..4ec97a9 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -112,8 +112,7 @@ null_modevent(module_t mod, int type, void *data)
 	case MOD_LOAD:
 		if (bootverbose)
 			printf("null: <null device, zero device>\n");
-		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
-		bzero(zbuf, PAGE_SIZE);
+		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
 		zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT,
 			GID_WHEEL, 0666, "zero");
 		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index d70628a..a5eea3c 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -169,11 +169,10 @@ pdq_pci_attach(
 	pci_conf_write(config_id, PCI_CFLT, data);
     }
 
-    sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
+    sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
     if (sc == NULL)
 	return;
 
-    bzero(sc, sizeof(pdq_softc_t));	/* Zero out the softc*/
     if (!pci_map_mem(config_id, PCI_CBMA, &va_csrs, &pa_csrs)) {
 	free((void *) sc, M_DEVBUF);
 	return;
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 6f6bf95..b494405 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -86,10 +86,10 @@ ppbus_add_child(device_t dev, int order, const char *name, int unit)
 	device_t child;
         
 	/* allocate ivars for the new ppbus child */
-	ppbdev = malloc(sizeof(struct ppb_device), M_PPBUSDEV, M_NOWAIT);
+	ppbdev = malloc(sizeof(struct ppb_device), M_PPBUSDEV,
+		M_NOWAIT | M_ZERO);
 	if (!ppbdev)
 		return NULL;
-	bzero(ppbdev, sizeof *ppbdev);
 
 	/* initialize the ivars */
 	ppbdev->name = name;
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index fafc3f1..1c409d5 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -186,9 +186,7 @@ static void
 vpo_cam_rescan(struct vpo_data *vpo)
 {
         struct cam_path *path;
-        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK);
-
-        bzero(ccb, sizeof(union ccb));
+        union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO);
 
         if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0)
             != CAM_REQ_CMP) {
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index a12110e..d3a3399 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -831,25 +831,24 @@ rp_attachcommon(CONTROLLER_T *ctlp, int num_aiops, int num_ports)
 
 	bzero(rp, sizeof(struct rp_port) * num_ports);
 	ctlp->tty = tty = (struct tty *)
-		malloc(sizeof(struct tty) * num_ports, M_TTYS, M_NOWAIT);
+		malloc(sizeof(struct tty) * num_ports, M_TTYS,
+			M_NOWAIT | M_ZERO);
 	if(tty == NULL) {
 		device_printf(ctlp->dev, "rp_attachcommon: Could not malloc tty structures.\n");
 		retval = ENOMEM;
 		goto nogo;
 	}
-	bzero(tty, sizeof(struct tty) * num_ports);
 
 	oldspl = spltty();
 	rp_addr(unit) = rp;
 	splx(oldspl);
 
-	dev_nodes = ctlp->dev_nodes = malloc(sizeof(*(ctlp->dev_nodes)) * rp_num_ports[unit] * 6, M_DEVBUF, M_NOWAIT);
+	dev_nodes = ctlp->dev_nodes = malloc(sizeof(*(ctlp->dev_nodes)) * rp_num_ports[unit] * 6, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if(ctlp->dev_nodes == NULL) {
 		device_printf(ctlp->dev, "rp_attachcommon: Could not malloc device node structures.\n");
 		retval = ENOMEM;
 		goto nogo;
 	}
-	bzero(dev_nodes, sizeof(*(ctlp->dev_nodes)) * rp_num_ports[unit] * 6);
 
 	for (i = 0 ; i < rp_num_ports[unit] ; i++) {
 		*(dev_nodes++) = make_dev(&rp_cdevsw, ((unit + 1) << 16) | i,
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index 0dc001b..bbbdcb2 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -173,23 +173,20 @@ rp_probe(device_t dev)
 
 	/* The IO ports of AIOPs for an ISA controller are discrete. */
 	ctlp->io_num = 1;
-	ctlp->io_rid = malloc(sizeof(*(ctlp->io_rid)) * MAX_AIOPS_PER_BOARD, M_DEVBUF, M_NOWAIT);
-	ctlp->io = malloc(sizeof(*(ctlp->io)) * MAX_AIOPS_PER_BOARD, M_DEVBUF, M_NOWAIT);
+	ctlp->io_rid = malloc(sizeof(*(ctlp->io_rid)) * MAX_AIOPS_PER_BOARD, M_DEVBUF, M_NOWAIT | M_ZERO);
+	ctlp->io = malloc(sizeof(*(ctlp->io)) * MAX_AIOPS_PER_BOARD, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (ctlp->io_rid == NULL || ctlp->io == NULL) {
 		device_printf(dev, "rp_attach: Out of memory.\n");
 		retval = ENOMEM;
 		goto nogo;
 	}
-	bzero(ctlp->io_rid, sizeof(*(ctlp->io_rid)) * MAX_AIOPS_PER_BOARD);
-	bzero(ctlp->io, sizeof(*(ctlp->io)) * MAX_AIOPS_PER_BOARD);
 
-	ctlp->bus_ctlp = malloc(sizeof(ISACONTROLLER_t) * 1, M_DEVBUF, M_NOWAIT);
+	ctlp->bus_ctlp = malloc(sizeof(ISACONTROLLER_t) * 1, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (ctlp->bus_ctlp == NULL) {
 		device_printf(dev, "rp_attach: Out of memory.\n");
 		retval = ENOMEM;
 		goto nogo;
 	}
-	bzero(ctlp->bus_ctlp, sizeof(ISACONTROLLER_t) * 1);
 
 	ctlp->io_rid[0] = 0;
 	if (rp_controller != NULL) {
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index 7f2d60c..fa25dea 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -165,15 +165,13 @@ rp_pciattach(device_t dev)
 
 	/* The IO ports of AIOPs for a PCI controller are continuous. */
 	ctlp->io_num = 1;
-	ctlp->io_rid = malloc(sizeof(*(ctlp->io_rid)) * ctlp->io_num, M_DEVBUF, M_NOWAIT);
-	ctlp->io = malloc(sizeof(*(ctlp->io)) * ctlp->io_num, M_DEVBUF, M_NOWAIT);
+	ctlp->io_rid = malloc(sizeof(*(ctlp->io_rid)) * ctlp->io_num, M_DEVBUF, M_NOWAIT | M_ZERO);
+	ctlp->io = malloc(sizeof(*(ctlp->io)) * ctlp->io_num, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (ctlp->io_rid == NULL || ctlp->io == NULL) {
 		device_printf(dev, "rp_pciattach: Out of memory.\n");
 		retval = ENOMEM;
 		goto nogo;
 	}
-	bzero(ctlp->io_rid, sizeof(*(ctlp->io_rid)) * ctlp->io_num);
-	bzero(ctlp->io, sizeof(*(ctlp->io)) * ctlp->io_num);
 
 	ctlp->bus_ctlp = NULL;
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 28e6a42..cc61a17 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -497,23 +497,22 @@ try_next:
 			(maddr + (unsigned)(modp->sm_next & 0x7fff));
 	}
 	sc->sc_ports = (struct si_port *)malloc(sizeof(struct si_port) * nport,
-		M_DEVBUF, M_NOWAIT);
+		M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc->sc_ports == 0) {
 mem_fail:
 		printf("si%d: fail to malloc memory for port structs\n",
 			unit);
 		return EINVAL;
 	}
-	bzero(sc->sc_ports, sizeof(struct si_port) * nport);
 	sc->sc_nport = nport;
 
 	/*
 	 * allocate tty structures for ports
 	 */
-	tp = (struct tty *)malloc(sizeof(*tp) * nport, M_DEVBUF, M_NOWAIT);
+	tp = (struct tty *)malloc(sizeof(*tp) * nport, M_DEVBUF,
+		M_NOWAIT | M_ZERO);
 	if (tp == 0)
 		goto mem_fail;
-	bzero(tp, sizeof(*tp) * nport);
 	si__tty = tp;
 
 	/*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 9950513..b448e30 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -291,8 +291,7 @@ snpopen(dev, flag, mode, p)
 	if (dev->si_drv1 == NULL) {
 		int mynor = minor(dev);
 
-		dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP, M_WAITOK);
-		bzero(snp, sizeof(*snp));
+		dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP, M_WAITOK|M_ZERO);
 		make_dev(&snp_cdevsw, mynor, 0, 0, 0600, "snp%d", mynor);
 	} else
 		return (EBUSY);
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 89b2c99..b27d2f5 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -659,10 +659,10 @@ srattach_isa(struct isa_device *id)
 	 * Allocate the software interface table(s)
 	 */
 	MALLOC(hc->sc, struct sr_softc *,
-		hc->numports * sizeof(struct sr_softc), M_DEVBUF, M_WAITOK);
+		hc->numports * sizeof(struct sr_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc->sc == NULL)
 		return(0);
-	bzero(hc->sc, hc->numports * sizeof(struct sr_softc));
 
 	id->id_ointr = srintr;
 
@@ -768,18 +768,16 @@ srattach_pci(int unit, vm_offset_t plx_vaddr, vm_offset_t sca_vaddr)
 		hc = hc->next;
 	}
 
-	MALLOC(hc, struct sr_hardc *, sizeof(*hc), M_DEVBUF, M_WAITOK);
+	MALLOC(hc, struct sr_hardc *, sizeof(*hc), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc == NULL)
 		return NULL;
-	bzero(hc, sizeof(*hc));
 
-	MALLOC(hc->sc, struct sr_softc *,
-		numports * sizeof(struct sr_softc), M_DEVBUF, M_WAITOK);
+	MALLOC(hc->sc, struct sr_softc *, numports * sizeof(struct sr_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc->sc == NULL) {
 		FREE(hc, M_DEVBUF);
 		return NULL;
 	}
-	bzero(hc->sc, numports * sizeof(struct sr_softc));
 	*hcp = hc;
 
 	hc->numports = numports;
@@ -3188,12 +3186,11 @@ ngsr_rcvmsg(node_p node, struct ng_mesg *msg, const char *retaddr,
 			    int pos = 0;
 			    int resplen = sizeof(struct ng_mesg) + 512;
 			    MALLOC(*resp, struct ng_mesg *, resplen,
-					M_NETGRAPH, M_NOWAIT);
+					M_NETGRAPH, M_NOWAIT | M_ZERO);
 			    if (*resp == NULL) { 
 				error = ENOMEM;
 				break;
 			    }       
-			    bzero(*resp, resplen);
 			    arg = (*resp)->data;
 
 			    /*
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 89b2c99..b27d2f5 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -659,10 +659,10 @@ srattach_isa(struct isa_device *id)
 	 * Allocate the software interface table(s)
 	 */
 	MALLOC(hc->sc, struct sr_softc *,
-		hc->numports * sizeof(struct sr_softc), M_DEVBUF, M_WAITOK);
+		hc->numports * sizeof(struct sr_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc->sc == NULL)
 		return(0);
-	bzero(hc->sc, hc->numports * sizeof(struct sr_softc));
 
 	id->id_ointr = srintr;
 
@@ -768,18 +768,16 @@ srattach_pci(int unit, vm_offset_t plx_vaddr, vm_offset_t sca_vaddr)
 		hc = hc->next;
 	}
 
-	MALLOC(hc, struct sr_hardc *, sizeof(*hc), M_DEVBUF, M_WAITOK);
+	MALLOC(hc, struct sr_hardc *, sizeof(*hc), M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc == NULL)
 		return NULL;
-	bzero(hc, sizeof(*hc));
 
-	MALLOC(hc->sc, struct sr_softc *,
-		numports * sizeof(struct sr_softc), M_DEVBUF, M_WAITOK);
+	MALLOC(hc->sc, struct sr_softc *, numports * sizeof(struct sr_softc),
+		M_DEVBUF, M_WAITOK | M_ZERO);
 	if (hc->sc == NULL) {
 		FREE(hc, M_DEVBUF);
 		return NULL;
 	}
-	bzero(hc->sc, numports * sizeof(struct sr_softc));
 	*hcp = hc;
 
 	hc->numports = numports;
@@ -3188,12 +3186,11 @@ ngsr_rcvmsg(node_p node, struct ng_mesg *msg, const char *retaddr,
 			    int pos = 0;
 			    int resplen = sizeof(struct ng_mesg) + 512;
 			    MALLOC(*resp, struct ng_mesg *, resplen,
-					M_NETGRAPH, M_NOWAIT);
+					M_NETGRAPH, M_NOWAIT | M_ZERO);
 			    if (*resp == NULL) { 
 				error = ENOMEM;
 				break;
 			    }       
-			    bzero(*resp, resplen);
 			    arg = (*resp)->data;
 
 			    /*
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d622613..a1137ff 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -2541,8 +2541,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK);
-	    bzero(sc->dev, sizeof(dev_t)*sc->vtys);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 0080611..ca2a89d 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -747,13 +747,12 @@ epic_common_attach(sc)
 	i = sizeof(struct epic_frag_list)*TX_RING_SIZE +
 	    sizeof(struct epic_rx_desc)*RX_RING_SIZE + 
 	    sizeof(struct epic_tx_desc)*TX_RING_SIZE + PAGE_SIZE,
-	sc->pool = (epic_softc_t *) malloc( i, M_DEVBUF, M_NOWAIT);
+	sc->pool = (epic_softc_t *) malloc(i, M_DEVBUF, M_NOWAIT | M_ZERO);
 
 	if (sc->pool == NULL) {
 		printf(": can't allocate memory for buffers\n");
 		return -1;
 	}
-	bzero(sc->pool, i);
 
 	/* Align pool on PAGE_SIZE */
 	pool = (caddr_t)sc->pool;
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 217ed9e..96c861e 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -182,10 +182,9 @@ vnfindvn(dev_t dev)
 		}
 	}
 	if (!vn) {
-		vn = malloc(sizeof *vn, M_DEVBUF, M_WAITOK);
+		vn = malloc(sizeof *vn, M_DEVBUF, M_WAITOK | M_ZERO);
 		if (!vn)
 			return (NULL);
-		bzero(vn, sizeof *vn);
 		vn->sc_unit = unit;
 		dev->si_drv1 = vn;
 		make_dev(&vn_cdevsw,