? sys/rm_bzero.sh
Index: sys/arch/acorn26/acorn26/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn26/acorn26/pmap.c,v
retrieving revision 1.22
diff -u -p -r1.22 pmap.c
--- sys/arch/acorn26/acorn26/pmap.c	17 Dec 2008 20:51:31 -0000	1.22
+++ sys/arch/acorn26/acorn26/pmap.c	19 Dec 2008 18:57:37 -0000
@@ -256,7 +256,7 @@ pmap_bootstrap(int npages, paddr_t zp_ph
 	pv_table_size = round_page(physmem * sizeof(struct pv_entry));
 	pv_table =
 	    (struct pv_entry *)uvm_pageboot_alloc(pv_table_size);
-	bzero(pv_table, pv_table_size);
+	memset(pv_table, 0, pv_table_size);
 #ifdef PMAP_DEBUG_MODIFIED
 	for (i = 0; i < physmem; i++)
 		pv_table[i].pv_pflags |= PV_MODIFIED;
@@ -264,11 +264,11 @@ pmap_bootstrap(int npages, paddr_t zp_ph
 
 	/* Set up the kernel's pmap */
 	pmap = pmap_kernel();
-	bzero(pmap, sizeof(*pmap));
+	memset(pmap, 0, sizeof(*pmap));
 	pmap->pm_count = 1;
 	pmap->pm_flags = PM_ACTIVE; /* Kernel pmap always is */
 	pmap->pm_entries = kernel_pmap_entries;
-	bzero(pmap->pm_entries, sizeof(struct pv_entry *) * PM_NENTRIES);
+	memset(pmap->pm_entries, 0, sizeof(struct pv_entry *) * PM_NENTRIES);
 	/* pmap_pinit(pmap); */
 	/* Clear the MEMC's page table */
 	/* XXX Maybe we should leave zero page alone? */
@@ -377,7 +377,7 @@ pmap_create()
 	if (!pmap_initialised) 
 		pmap_init2();
 	pmap = pool_get(&pmap_pool, PR_WAITOK);
-	bzero(pmap, sizeof(*pmap));
+	memset(pmap, 0, sizeof(*pmap));
 	pmap->pm_entries = (struct pv_entry **)malloc(
 		sizeof(struct pv_entry *) * PM_NENTRIES, M_VMPMAP,
 		M_WAITOK | M_ZERO);
@@ -1068,7 +1068,7 @@ pmap_zero_page(paddr_t pa)
 	UVMHIST_FUNC("pmap_zero_page");
 
 	UVMHIST_CALLED(pmaphist);
-	bzero(pmap_find(pa), PAGE_SIZE);
+	memset(pmap_find(pa), 0, PAGE_SIZE);
 }
 
 void
Index: sys/arch/acorn26/acorn26/start.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn26/acorn26/start.c,v
retrieving revision 1.9
diff -u -p -r1.9 start.c
--- sys/arch/acorn26/acorn26/start.c	12 Nov 2008 12:35:54 -0000	1.9
+++ sys/arch/acorn26/acorn26/start.c	19 Dec 2008 18:57:37 -0000
@@ -113,7 +113,7 @@ start(initbootconfig)
 #define MSGBUF_PHYSADDR	((paddr_t)0x00090000)
 
 	/* We can't trust the BSS (at least not with my linker) */
-	bzero(__bss_start__, __bss_end__ - __bss_start__);
+	memset(__bss_start__, 0, __bss_end__ - __bss_start__);
 
 	/* Save boot configuration somewhere */
 	memcpy(&bootconfig, initbootconfig, sizeof(struct bootconfig));
@@ -191,7 +191,7 @@ start(initbootconfig)
 	 * stack page.  That's our current stack page too.
 	 */
 	proc0paddr = (struct user *)(round_page((vaddr_t)&onstack) - USPACE);
-	bzero(proc0paddr, sizeof(*proc0paddr));
+	memset(proc0paddr, 0, sizeof(*proc0paddr));
 
 	/*
 	 * Get a handle on the IOC's I2C interface in the event we need
Index: sys/arch/acorn26/acorn26/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn26/acorn26/vm_machdep.c,v
retrieving revision 1.20
diff -u -p -r1.20 vm_machdep.c
--- sys/arch/acorn26/acorn26/vm_machdep.c	25 Oct 2008 22:12:33 -0000	1.20
+++ sys/arch/acorn26/acorn26/vm_machdep.c	19 Dec 2008 18:57:39 -0000
@@ -127,7 +127,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 	sf = (struct switchframe *)tf - 1;
 	/* Duplicate old process's trapframe (if it had one) */
 	if (l1->l_addr->u_pcb.pcb_tf == NULL)
-		bzero(tf, sizeof(*tf));
+		memset(tf, 0, sizeof(*tf));
 	else
 		*tf = *l1->l_addr->u_pcb.pcb_tf;
 	/* If specified, give the child a different stack. */
@@ -135,7 +135,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 		tf->tf_usr_sp = (u_int)stack + stacksize;
 	l2->l_addr->u_pcb.pcb_tf = tf;
 	/* Fabricate a new switchframe */
-	bzero(sf, sizeof(*sf));
+	memset(sf, 0, sizeof(*sf));
 
 	cpu_setfunc(l2, func, arg);
 }
Index: sys/arch/acorn26/podulebus/podulebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn26/podulebus/podulebus.c,v
retrieving revision 1.16
diff -u -p -r1.16 podulebus.c
--- sys/arch/acorn26/podulebus/podulebus.c	17 Dec 2008 20:51:31 -0000	1.16
+++ sys/arch/acorn26/podulebus/podulebus.c	19 Dec 2008 18:57:39 -0000
@@ -112,7 +112,7 @@ podulebus_probe_podule(struct device *se
 	u_int8_t extecid[EXTECID_SIZE];
 	struct podulebus_attach_args pa;
 
-	bzero(&pa, sizeof(pa));
+	memset(&pa, 0, sizeof(pa));
 	id_bst = sc->sc_ioc.ioc_sync_t;
 	bus_space_subregion(id_bst, sc->sc_ioc.ioc_sync_h,
 			    slotnum * PODULE_GAP, PODULE_GAP, &id_bsh);
Index: sys/arch/acorn32/podulebus/esc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/esc.c,v
retrieving revision 1.18
diff -u -p -r1.18 esc.c
--- sys/arch/acorn32/podulebus/esc.c	8 Mar 2006 23:46:22 -0000	1.18
+++ sys/arch/acorn32/podulebus/esc.c	19 Dec 2008 18:57:39 -0000
@@ -174,7 +174,7 @@ esc_init_nexus(dev, nexus)
 	struct esc_softc *dev;
 	struct nexus	  *nexus;
 {
-	bzero(nexus, sizeof(struct nexus));
+	memset(nexus, 0, sizeof(struct nexus));
 
 	nexus->state	= ESC_NS_IDLE;
 	nexus->period	= 200;
Index: sys/arch/acorn32/podulebus/if_ie.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/if_ie.c,v
retrieving revision 1.20
diff -u -p -r1.20 if_ie.c
--- sys/arch/acorn32/podulebus/if_ie.c	7 Nov 2008 00:20:01 -0000	1.20
+++ sys/arch/acorn32/podulebus/if_ie.c	19 Dec 2008 18:57:40 -0000
@@ -603,7 +603,7 @@ iezero(sc, p, size)
 		if (cnt > size)
 			cnt=size;
 		setpage(sc, p);
-		bzero((char *)sc->sc_ram + IE_COFF2POFF(p), 2*cnt);
+		memset((char *)sc->sc_ram + IE_COFF2POFF(p), 0, 2*cnt);
 		p += cnt;
 		size -= cnt;
 	}
@@ -796,7 +796,7 @@ setup_rfa(sc, ptr)
     {
 	/* Receive frame descriptors */
         struct ie_recv_frame_desc rfd;
-	bzero( &rfd, sizeof rfd );
+	memset( &rfd, 0, sizeof rfd );
 	for ( i=0; i<NFRAMES; i++ )
 	{
 	    sc->rframes[i] = ptr;
@@ -816,7 +816,7 @@ setup_rfa(sc, ptr)
     {
 	/* Receive frame descriptors */
 	struct ie_recv_buf_desc rbd;
-	bzero(&rbd, sizeof rbd);
+	memset(&rbd, 0, sizeof rbd);
 	for ( i=0; i<NRXBUF; i++ )
 	{
 	    sc->rbuffs[i] = ptr;
Index: sys/arch/acorn32/podulebus/sfas.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/sfas.c,v
retrieving revision 1.16
diff -u -p -r1.16 sfas.c
--- sys/arch/acorn32/podulebus/sfas.c	8 Mar 2006 23:46:22 -0000	1.16
+++ sys/arch/acorn32/podulebus/sfas.c	19 Dec 2008 18:57:40 -0000
@@ -167,7 +167,7 @@ sfas_init_nexus(dev, nexus)
 	struct sfas_softc *dev;
 	struct nexus	  *nexus;
 {
-	bzero(nexus, sizeof(struct nexus));
+	memset(nexus, 0, sizeof(struct nexus));
 
 	nexus->state	= SFAS_NS_IDLE;
 	nexus->period	= 200;
Index: sys/arch/acorn32/stand/boot32/boot32.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn32/stand/boot32/boot32.c,v
retrieving revision 1.35
diff -u -p -r1.35 boot32.c
--- sys/arch/acorn32/stand/boot32/boot32.c	23 Nov 2008 17:33:45 -0000	1.35
+++ sys/arch/acorn32/stand/boot32/boot32.c	19 Dec 2008 18:57:40 -0000
@@ -818,7 +818,7 @@ main(int argc, char **argv)
 	kernel_free_vm_start = (marks[MARK_END] + nbpp-1) & ~(nbpp-1);
 
 	/* we seem to be forced to clear the marks[] ? */
-	bzero(marks, sizeof(marks));
+	memset(marks, 0, sizeof(marks));
 
 	/* really load it ! */
 	ret = loadfile(booted_file, marks, LOAD_KERNEL);
Index: sys/arch/alpha/a12/if_ade.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/a12/if_ade.c,v
retrieving revision 1.34
diff -u -p -r1.34 if_ade.c
--- sys/arch/alpha/a12/if_ade.c	7 Nov 2008 00:20:01 -0000	1.34
+++ sys/arch/alpha/a12/if_ade.c	19 Dec 2008 18:57:41 -0000
@@ -5101,7 +5101,7 @@ tulip_pci_attach(
     sc = (tulip_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
     if (sc == NULL)
 	return;
-    bzero(sc, sizeof(*sc));				/* Zero out the softc*/
+    memset(sc, 0, sizeof(*sc));				/* Zero out the softc*/
 #endif
 
     PCI_GETBUSDEVINFO(sc);
Index: sys/arch/amiga/amiga/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/amiga/machdep.c,v
retrieving revision 1.212
diff -u -p -r1.212 machdep.c
--- sys/arch/amiga/amiga/machdep.c	30 Nov 2008 18:21:32 -0000	1.212
+++ sys/arch/amiga/amiga/machdep.c	19 Dec 2008 18:57:41 -0000
@@ -366,7 +366,7 @@ setregs(l, pack, stack)
 	l->l_addr->u_pcb.pcb_fpregs.fpf_null = 0;
 #ifdef FPU_EMULATE
 	if (!fputype)
-		bzero(&l->l_addr->u_pcb.pcb_fpregs, sizeof(struct fpframe));
+		memset(&l->l_addr->u_pcb.pcb_fpregs, 0, sizeof(struct fpframe));
 	else
 #endif
 		m68881_restore(&l->l_addr->u_pcb.pcb_fpregs);
@@ -547,7 +547,7 @@ cpu_dumpconf()
 	extern u_int Sysseg_pa;
 	extern int end[];
 
-	bzero(&cpu_kcore_hdr, sizeof(cpu_kcore_hdr));
+	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 
 	/*
 	 * Intitialize the `dispatcher' portion of the header.
@@ -679,7 +679,7 @@ dumpsys()
 	}
 	kseg_p = (kcore_seg_t *)dump_hdr;
 	chdr_p = (cpu_kcore_hdr_t *)&dump_hdr[ALIGN(sizeof(*kseg_p))];
-	bzero(dump_hdr, sizeof(dump_hdr));
+	memset(dump_hdr, 0, sizeof(dump_hdr));
 
 	/*
 	 * Generate a segment header
Index: sys/arch/amiga/amiga/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/amiga/pmap.c,v
retrieving revision 1.139
diff -u -p -r1.139 pmap.c
--- sys/arch/amiga/amiga/pmap.c	19 Dec 2008 18:49:38 -0000	1.139
+++ sys/arch/amiga/amiga/pmap.c	19 Dec 2008 18:57:42 -0000
@@ -2342,7 +2342,7 @@ pmap_enter_ptpage(pmap, va, can_fail)
 				panic("enter_pt: out of address space");
 			pmap->pm_stfree &= ~l2tobm(ix);
 			addr = (void *)&pmap->pm_stab[ix * SG4_LEV2SIZE];
-			bzero(addr, SG4_LEV2SIZE * sizeof(st_entry_t));
+			memset(addr, 0, SG4_LEV2SIZE * sizeof(st_entry_t));
 			addr = (void *)&pmap->pm_stpa[ix * SG4_LEV2SIZE];
 			*ste = (u_int) addr | SG_RW | SG_U | SG_V;
 #ifdef DEBUG
@@ -2399,7 +2399,7 @@ pmap_enter_ptpage(pmap, va, can_fail)
 		kpt->kpt_next = kpt_used_list;
 		kpt_used_list = kpt;
 		ptpa = kpt->kpt_pa;
-		bzero((char *)kpt->kpt_va, PAGE_SIZE);
+		memset((char *)kpt->kpt_va, 0, PAGE_SIZE);
 		pmap_enter(pmap, va, ptpa, VM_PROT_READ | VM_PROT_WRITE,
 		    VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED);
 		pmap_update(pmap);
Index: sys/arch/amiga/dev/amidisplaycc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/amidisplaycc.c,v
retrieving revision 1.21
diff -u -p -r1.21 amidisplaycc.c
--- sys/arch/amiga/dev/amidisplaycc.c	19 Dec 2008 18:49:38 -0000	1.21
+++ sys/arch/amiga/dev/amidisplaycc.c	19 Dec 2008 18:57:42 -0000
@@ -893,10 +893,10 @@ amidisplaycc_copyrows(void *screen, int 
 
 				if (copysize > 0) {
 					/* Do it all */
-					bzero(dst, copysize);
+					memset(dst, 0, copysize);
 				} else {
 					for (i = 0 ; i < fontheight ; i++) {
-						bzero(dst, widthbytes);
+						memset(dst, 0, widthbytes);
 						dst += linebytes;
 					}
 				}
Index: sys/arch/amiga/dev/fd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/fd.c,v
retrieving revision 1.79
diff -u -p -r1.79 fd.c
--- sys/arch/amiga/dev/fd.c	11 Jun 2008 12:59:10 -0000	1.79
+++ sys/arch/amiga/dev/fd.c	19 Dec 2008 18:57:43 -0000
@@ -728,7 +728,7 @@ fdgetdefaultlabel(struct fd_softc *sc, s
 /* (variable part) XXX ick */
 {
 
-	bzero(lp, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = FDSECSIZE;
 	lp->d_ntracks = FDNHEADS;
 	lp->d_ncylinders = sc->type->ncylinders;
@@ -772,8 +772,8 @@ fdgetdisklabel(struct fd_softc *sc, dev_
 	part = FDPART(dev);
 	lp = sc->dkdev.dk_label;
 	clp =  sc->dkdev.dk_cpulabel;
-	bzero(lp, sizeof(struct disklabel));
-	bzero(clp, sizeof(struct cpu_disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
+	memset(clp, 0, sizeof(struct cpu_disklabel));
 
 	lp->d_secsize = FDSECSIZE;
 	lp->d_ntracks = FDNHEADS;
Index: sys/arch/amiga/dev/grfabs_cc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/grfabs_cc.c,v
retrieving revision 1.30
diff -u -p -r1.30 grfabs_cc.c
--- sys/arch/amiga/dev/grfabs_cc.c	17 Oct 2007 19:53:16 -0000	1.30
+++ sys/arch/amiga/dev/grfabs_cc.c	19 Dec 2008 18:57:43 -0000
@@ -320,7 +320,7 @@ alloc_bitmap(u_short width, u_short heig
 	bm = alloc_chipmem(total_size);
 	if (bm) {
 		if (flags & BMF_CLEAR) {
-			bzero(bm, total_size);
+			memset(bm, 0, total_size);
 		}
 		bm->bytes_per_row = bpr;
 		bm->rows = height;
@@ -839,8 +839,8 @@ cc_init_ntsc_hires(void)
 
 		h_this = &hires_mode;
 		h_this_data = &hires_mode_data;
-		bzero(h_this, sizeof(dmode_t));
-		bzero(h_this_data, sizeof(dmdata_t));
+		memset(h_this, 0, sizeof(dmode_t));
+		memset(h_this_data, 0, sizeof(dmdata_t));
 
 		h_this->name = "ntsc: hires";
 		h_this->nominal_size.width = 640;
@@ -1021,8 +1021,8 @@ cc_init_ntsc_hires_lace(void)
 
 		hl_this = &hires_lace_mode;
 		hl_this_data = &hires_lace_mode_data;
-		bzero(hl_this, sizeof(dmode_t));
-		bzero(hl_this_data, sizeof(dmdata_t));
+		memset(hl_this, 0, sizeof(dmode_t));
+		memset(hl_this_data, 0, sizeof(dmdata_t));
 
 		hl_this->name = "ntsc: hires interlace";
 		hl_this->nominal_size.width = 640;
@@ -1247,8 +1247,8 @@ cc_init_ntsc_hires_dlace(void)
 
 		hdl_this = &hires_dlace_mode;
 		hdl_this_data = &hires_dlace_mode_data;
-		bzero(hdl_this, sizeof(dmode_t));
-		bzero(hdl_this_data, sizeof(dmdata_t));
+		memset(hdl_this, 0, sizeof(dmode_t));
+		memset(hdl_this_data, 0, sizeof(dmdata_t));
 
 		hdl_this->name = "ntsc: hires double interlace";
 		hdl_this->nominal_size.width = 640;
@@ -1503,8 +1503,8 @@ cc_init_ntsc_a2024(void)
 
 		a24_this = &a2024_mode;
 		a24_this_data = &a2024_mode_data;
-		bzero(a24_this, sizeof(dmode_t));
-		bzero(a24_this_data, sizeof(dmdata_t));
+		memset(a24_this, 0, sizeof(dmode_t));
+		memset(a24_this_data, 0, sizeof(dmdata_t));
 
 		a24_this->name = "ntsc: A2024 15 kHz";
 		a24_this->nominal_size.width = 1024;
@@ -1792,8 +1792,8 @@ cc_init_ntsc_aga(void)
 
 		aga_this = &aga_mode;
 		aga_this_data = &aga_mode_data;
-		bzero(aga_this, sizeof(dmode_t));
-		bzero(aga_this_data, sizeof(dmdata_t));
+		memset(aga_this, 0, sizeof(dmode_t));
+		memset(aga_this_data, 0, sizeof(dmdata_t));
 
 		aga_this->name = "ntsc: AGA dbl";
 		aga_this->nominal_size.width = 640;
@@ -2101,8 +2101,8 @@ cc_init_super72(void)
 
 		super72_this = &super72_mode;
 		super72_this_data = &super72_mode_data;
-		bzero(super72_this, sizeof(dmode_t));
-		bzero(super72_this_data, sizeof(dmdata_t));
+		memset(super72_this, 0, sizeof(dmode_t));
+		memset(super72_this_data, 0, sizeof(dmdata_t));
 
 		super72_this->name = "super72: superhires interlace";
 		super72_this->nominal_size.width = 800;
@@ -2393,8 +2393,8 @@ cc_init_pal_hires(void)
 
 		ph_this = &pal_hires_mode;
 		ph_this_data = &pal_hires_mode_data;
-		bzero(ph_this, sizeof(dmode_t));
-		bzero(ph_this_data, sizeof(dmdata_t));
+		memset(ph_this, 0, sizeof(dmode_t));
+		memset(ph_this_data, 0, sizeof(dmdata_t));
 
 		ph_this->name = "pal: hires";
 		ph_this->nominal_size.width = 640;
@@ -2562,8 +2562,8 @@ cc_init_pal_hires_lace(void)
 
 		phl_this = &pal_hires_lace_mode;
 		phl_this_data = &pal_hires_lace_mode_data;
-		bzero(phl_this, sizeof(dmode_t));
-		bzero(phl_this_data, sizeof(dmdata_t));
+		memset(phl_this, 0, sizeof(dmode_t));
+		memset(phl_this_data, 0, sizeof(dmdata_t));
 
 		phl_this->name = "pal: hires interlace";
 		phl_this->nominal_size.width = 640;
@@ -2762,8 +2762,8 @@ cc_init_pal_hires_dlace(void)
 
 		phdl_this = &pal_hires_dlace_mode;
 		phdl_this_data = &pal_hires_dlace_mode_data;
-		bzero(phdl_this, sizeof(dmode_t));
-		bzero(phdl_this_data, sizeof(dmdata_t));
+		memset(phdl_this, 0, sizeof(dmode_t));
+		memset(phdl_this_data, 0, sizeof(dmdata_t));
 
 		phdl_this->name = "pal: hires double interlace";
 		phdl_this->nominal_size.width = 640;
@@ -2981,8 +2981,8 @@ cc_init_pal_a2024(void)
 
 		p24_this = &pal_a2024_mode;
 		p24_this_data = &pal_a2024_mode_data;
-		bzero(p24_this, sizeof(dmode_t));
-		bzero(p24_this_data, sizeof(dmdata_t));
+		memset(p24_this, 0, sizeof(dmode_t));
+		memset(p24_this_data, 0, sizeof(dmdata_t));
 
 		p24_this->name = "pal: A2024 15 kHz";
 		p24_this->nominal_size.width = 1024;
@@ -3217,8 +3217,8 @@ cc_init_pal_aga(void)
 
 		paga_this = &paga_mode;
 		paga_this_data = &paga_mode_data;
-		bzero(paga_this, sizeof(dmode_t));
-		bzero(paga_this_data, sizeof(dmdata_t));
+		memset(paga_this, 0, sizeof(dmode_t));
+		memset(paga_this_data, 0, sizeof(dmdata_t));
 
 		paga_this->name = "pal: AGA dbl";
 		paga_this->nominal_size.width = 640;
Index: sys/arch/amiga/dev/ite.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/ite.c,v
retrieving revision 1.84
diff -u -p -r1.84 ite.c
--- sys/arch/amiga/dev/ite.c	11 Jun 2008 12:59:10 -0000	1.84
+++ sys/arch/amiga/dev/ite.c	19 Dec 2008 18:57:43 -0000
@@ -755,7 +755,7 @@ ite_reset(struct ite_softc *ip)
 	ip->keypad_appmode = 0;
 	ip->imode = 0;
 	ip->key_repeat = 1;
-	bzero(ip->tabs, ip->cols);
+	memset(ip->tabs, 0, ip->cols);
 	for (i = 0; i < ip->cols; i++)
 		ip->tabs[i] = ((i & 7) == 0);
 }
Index: sys/arch/amiga/dev/ite_cc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/ite_cc.c,v
retrieving revision 1.38
diff -u -p -r1.38 ite_cc.c
--- sys/arch/amiga/dev/ite_cc.c	4 Mar 2007 05:59:21 -0000	1.38
+++ sys/arch/amiga/dev/ite_cc.c	19 Dec 2008 18:57:44 -0000
@@ -700,7 +700,7 @@ clear8(struct ite_softc *ip, int sy, int
 	  int i;
 	  u_char *ptr = cci->row_ptr[sy];
 	  for (i=0; i < ip->ftheight; i++) {
-            bzero(ptr, bm->bytes_per_row);
+            memset(ptr, 0, bm->bytes_per_row);
             ptr += bm->bytes_per_row + bm->row_mod;			/* don't get any smart
                                                    ideas, because this is for
                                                    interleaved bitmaps */
Index: sys/arch/amiga/dev/sbic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/sbic.c,v
retrieving revision 1.62
diff -u -p -r1.62 sbic.c
--- sys/arch/amiga/dev/sbic.c	17 Oct 2007 19:53:17 -0000	1.62
+++ sys/arch/amiga/dev/sbic.c	19 Dec 2008 18:57:44 -0000
@@ -814,12 +814,12 @@ sbicinit(struct sbic_softc *dev)
 		dev->sc_nexus = NULL;
 		dev->sc_xs = NULL;
 		acb = dev->sc_acb;
-		bzero(acb, sizeof(dev->sc_acb));
+		memset(acb, 0, sizeof(dev->sc_acb));
 		for (i = 0; i < sizeof(dev->sc_acb) / sizeof(*acb); i++) {
 			TAILQ_INSERT_TAIL(&dev->free_list, acb, chain);
 			acb++;
 		}
-		bzero(dev->sc_tinfo, sizeof(dev->sc_tinfo));
+		memset(dev->sc_tinfo, 0, sizeof(dev->sc_tinfo));
 #ifdef DEBUG
 		/* make sure timeout is really not needed */
 		callout_reset(&dev->sc_timo_ch, 30 * hz,
@@ -918,12 +918,12 @@ sbicreset(struct sbic_softc *dev)
 		dev->sc_nexus = NULL;
 		dev->sc_xs = NULL;
 		acb = dev->sc_acb;
-		bzero(acb, sizeof(dev->sc_acb));
+		memset(acb, 0, sizeof(dev->sc_acb));
 		for (i = 0; i < sizeof(dev->sc_acb) / sizeof(*acb); i++) {
 			TAILQ_INSERT_TAIL(&dev->free_list, acb, chain);
 			acb++;
 		}
-		bzero(dev->sc_tinfo, sizeof(dev->sc_tinfo));
+		memset(dev->sc_tinfo, 0, sizeof(dev->sc_tinfo));
 	} else {
 		if (dev->sc_nexus != NULL) {
 			dev->sc_nexus->xs->error = XS_DRIVER_STUFFUP;
Index: sys/arch/amiga/dev/siop.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/siop.c,v
retrieving revision 1.60
diff -u -p -r1.60 siop.c
--- sys/arch/amiga/dev/siop.c	17 Dec 2008 20:51:31 -0000	1.60
+++ sys/arch/amiga/dev/siop.c	19 Dec 2008 18:57:44 -0000
@@ -644,7 +644,7 @@ siopreset(struct siop_softc *sc)
 	rp->siop_ctest7 |= sc->sc_ctest7;
 
 	/* will need to re-negotiate sync xfers */
-	bzero(&sc->sc_sync, sizeof (sc->sc_sync));
+	memset(&sc->sc_sync, 0, sizeof (sc->sc_sync));
 
 	i = rp->siop_istat;
 	if (i & SIOP_ISTAT_SIP)
@@ -664,12 +664,12 @@ siopreset(struct siop_softc *sc)
 		TAILQ_INIT(&sc->free_list);
 		sc->sc_nexus = NULL;
 		acb = sc->sc_acb;
-		bzero(acb, sizeof(struct siop_acb) * SIOP_NACB);
+		memset(acb, 0, sizeof(struct siop_acb) * SIOP_NACB);
 		for (i = 0; i < SIOP_NACB; i++) {
 			TAILQ_INSERT_TAIL(&sc->free_list, acb, chain);
 			acb++;
 		}
-		bzero(sc->sc_tinfo, sizeof(sc->sc_tinfo));
+		memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
 	} else {
 		if (sc->sc_nexus != NULL) {
 			sc->sc_nexus->xs->error = XS_RESET;
@@ -744,7 +744,7 @@ siop_start(struct siop_softc *sc, int ta
 	acb->ds.msginbuf = (char *) kvtop(&acb->msg[1]);
 	acb->ds.extmsgbuf = (char *) kvtop(&acb->msg[2]);
 	acb->ds.synmsgbuf = (char *) kvtop(&acb->msg[3]);
-	bzero(&acb->ds.chain, sizeof (acb->ds.chain));
+	memset(&acb->ds.chain, 0, sizeof (acb->ds.chain));
 
 	/*
 	 * Negotiate wide is the initial negotiation state;  since the 53c710
Index: sys/arch/amiga/dev/siop2.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/siop2.c,v
retrieving revision 1.32
diff -u -p -r1.32 siop2.c
--- sys/arch/amiga/dev/siop2.c	17 Dec 2008 20:51:32 -0000	1.32
+++ sys/arch/amiga/dev/siop2.c	19 Dec 2008 18:57:45 -0000
@@ -637,7 +637,7 @@ siopngreset(struct siop_softc *sc)
 	rp->siop_stime0 = 0x0c;		/* XXXXX check */
 
 	/* will need to re-negotiate sync xfers */
-	bzero(&sc->sc_sync, sizeof (sc->sc_sync));
+	memset(&sc->sc_sync, 0, sizeof (sc->sc_sync));
 
 	i = rp->siop_istat;
 	if (i & SIOP_ISTAT_SIP)
@@ -690,12 +690,12 @@ siopngreset(struct siop_softc *sc)
 		TAILQ_INIT(&sc->free_list);
 		sc->sc_nexus = NULL;
 		acb = sc->sc_acb;
-		bzero(acb, sizeof(struct siop_acb) * SIOP_NACB);
+		memset(acb, 0, sizeof(struct siop_acb) * SIOP_NACB);
 		for (i = 0; i < SIOP_NACB; i++) {
 			TAILQ_INSERT_TAIL(&sc->free_list, acb, chain);
 			acb++;
 		}
-		bzero(sc->sc_tinfo, sizeof(sc->sc_tinfo));
+		memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
 	} else {
 		if (sc->sc_nexus != NULL) {
 			sc->sc_nexus->xs->error = XS_RESET;
@@ -773,7 +773,7 @@ siopng_start(struct siop_softc *sc, int 
 	acb->ds.msginbuf = acb->ds.msgbuf + 1;
 	acb->ds.extmsgbuf = acb->ds.msginbuf + 1;
 	acb->ds.synmsgbuf = acb->ds.extmsgbuf + 1;
-	bzero(&acb->ds.chain, sizeof (acb->ds.chain));
+	memset(&acb->ds.chain, 0, sizeof (acb->ds.chain));
 
 	if (sc->sc_sync[target].state == NEG_WIDE) {
 		if (siopng_inhibit_wide[target]) {
Index: sys/arch/amigappc/amigappc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amigappc/amigappc/machdep.c,v
retrieving revision 1.33
diff -u -p -r1.33 machdep.c
--- sys/arch/amigappc/amigappc/machdep.c	2 Jul 2008 17:28:54 -0000	1.33
+++ sys/arch/amigappc/amigappc/machdep.c	19 Dec 2008 18:57:45 -0000
@@ -178,7 +178,7 @@ initppc(startkernel, endkernel)
 		"r"(battable[3].batl), "r"(battable[3].batu));
 
 	proc0.p_addr = proc0paddr;
-	bzero(proc0.p_addr, sizeof *proc0.p_addr);
+	memset(proc0.p_addr, 0, sizeof *proc0.p_addr);
 	curpcb = &proc0paddr->u_pcb;
 	curpm = curpcb->pcb_pmreal = curpcb->pcb_pm = pmap_kernel();
 
Index: sys/arch/arm/at91/at91emac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91emac.c,v
retrieving revision 1.2
diff -u -p -r1.2 at91emac.c
--- sys/arch/arm/at91/at91emac.c	3 Jul 2008 01:15:38 -0000	1.2
+++ sys/arch/arm/at91/at91emac.c	19 Dec 2008 18:57:45 -0000
@@ -418,7 +418,7 @@ emac_init(struct emac_softc *sc)
 	}
 	sc->rbqpage_dsaddr = sc->rbqpage_dmamap->dm_segs[0].ds_addr;
 
-	bzero(sc->rbqpage, sc->rbqlen);
+	memset(sc->rbqpage, 0, sc->rbqlen);
 
 	/* Set up pointers to start of each queue in kernel addr space.
 	 * Each descriptor queue or status queue entry uses 2 words
Index: sys/arch/arm/ep93xx/epe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epe.c,v
retrieving revision 1.18
diff -u -p -r1.18 epe.c
--- sys/arch/arm/ep93xx/epe.c	10 May 2008 15:31:04 -0000	1.18
+++ sys/arch/arm/ep93xx/epe.c	19 Dec 2008 18:57:45 -0000
@@ -350,7 +350,7 @@ epe_init(struct epe_softc *sc)
 		panic("%s: Cannot get DMA memory", sc->sc_dev.dv_xname);
 	}
 	sc->ctrlpage_dsaddr = sc->ctrlpage_dmamap->dm_segs[0].ds_addr;
-	bzero(sc->ctrlpage, PAGE_SIZE);
+	memset(sc->ctrlpage, 0, PAGE_SIZE);
 	
 	/* Set up pointers to start of each queue in kernel addr space.
 	 * Each descriptor queue or status queue entry uses 2 words
Index: sys/arch/arm/iomd/vidcvideo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/vidcvideo.c,v
retrieving revision 1.35
diff -u -p -r1.35 vidcvideo.c
--- sys/arch/arm/iomd/vidcvideo.c	29 Apr 2008 17:09:47 -0000	1.35
+++ sys/arch/arm/iomd/vidcvideo.c	19 Dec 2008 18:57:45 -0000
@@ -260,7 +260,7 @@ vidcvideo_getdevconfig(vaddr_t dense_add
 	vidcvideo_colourmap_and_cursor_init(dc);
 
 	/* blank the memory */
-	bzero((void*)dc->dc_vaddr, dc->dc_size);
+	memset((void*)dc->dc_vaddr, 0, dc->dc_size);
 
 	/* intitialise miscelanious */
 	dc->dc_writeback_delay = 0;
Index: sys/arch/atari/atari/atari_init.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/atari_init.c,v
retrieving revision 1.68
diff -u -p -r1.68 atari_init.c
--- sys/arch/atari/atari/atari_init.c	15 Nov 2008 21:30:50 -0000	1.68
+++ sys/arch/atari/atari/atari_init.c	19 Dec 2008 18:57:45 -0000
@@ -562,7 +562,7 @@ char	*esym_addr;		/* Address of kernel '
 	 * Must initialize p_addr before autoconfig or the
 	 * fault handler will get a NULL reference.
 	 */
-	bzero((u_char *)proc0paddr, USPACE);
+	memset((u_char *)proc0paddr, 0, USPACE);
 	lwp0.l_addr = (struct user *)proc0paddr;
 	curlwp = &lwp0;
 	curpcb  = &((struct user *)proc0paddr)->u_pcb;
@@ -853,7 +853,7 @@ u_long	kbase;
 	extern char end[];
 	int	i;
 
-	bzero(&cpu_kcore_hdr, sizeof(cpu_kcore_hdr));
+	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 
 	/*
 	 * Initialize the `dispatcher' portion of the header.
Index: sys/arch/atari/atari/be_bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/be_bus.c,v
retrieving revision 1.9
diff -u -p -r1.9 be_bus.c
--- sys/arch/atari/atari/be_bus.c	28 Apr 2008 20:23:14 -0000	1.9
+++ sys/arch/atari/atari/be_bus.c	19 Dec 2008 18:57:46 -0000
@@ -184,10 +184,11 @@ bus_space_tag_t	storage;
 	if (storage != NULL)
 		beb_t = storage;
 	else {
-	    if ((beb_t = malloc(sizeof(*beb_t), M_TEMP, M_NOWAIT)) == NULL)
-		return(NULL);
+		beb_t = malloc(sizeof(*beb_t), M_TEMP, M_NOWAIT);
+		if (beb_t == NULL)
+			return NULL;
 	}
-	bzero(beb_t, sizeof(*beb_t));
+	memset(beb_t, 0, sizeof(*beb_t));
 	
 	beb_t->abs_p_1   = beb_bus_space_peek_1;
 	beb_t->abs_p_2   = beb_bus_space_peek_2;
Index: sys/arch/atari/atari/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/bus.c,v
retrieving revision 1.47
diff -u -p -r1.47 bus.c
--- sys/arch/atari/atari/bus.c	4 Jun 2008 12:41:40 -0000	1.47
+++ sys/arch/atari/atari/bus.c	19 Dec 2008 18:57:46 -0000
@@ -390,7 +390,7 @@ _bus_dmamap_create(t, size, nsegments, m
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct atari_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
Index: sys/arch/atari/atari/disksubr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/disksubr.c,v
retrieving revision 1.35
diff -u -p -r1.35 disksubr.c
--- sys/arch/atari/atari/disksubr.c	2 Jan 2008 11:48:23 -0000	1.35
+++ sys/arch/atari/atari/disksubr.c	19 Dec 2008 18:57:46 -0000
@@ -83,7 +83,7 @@ readdisklabel(dev, strat, lp, clp)
 	int			e;
 
 	if (clp != NULL)
-		bzero(clp, sizeof *clp);
+		memset(clp, 0, sizeof *clp);
 	else printf("Warning: clp == NULL\n");
 
 	/*
@@ -103,7 +103,7 @@ readdisklabel(dev, strat, lp, clp)
 	 * 'if 0'
 	 */
 #if 0
-	bzero(lp->d_partitions, sizeof lp->d_partitions);
+	memset(lp->d_partitions, 0, sizeof lp->d_partitions);
 #endif
 
 	lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
@@ -229,7 +229,7 @@ writedisklabel(dev, strat, lp, clp)
 		 */
 		if (clp->cd_label != LABELOFFSET) {
 			clp->cd_label = LABELOFFSET;
-			bzero(bb, sizeof(*bb));
+			memset(bb, 0, sizeof(*bb));
 		}
 		bb->bb_magic = (blk == 0) ? NBDAMAGIC : AHDIMAGIC;
 		BBSETLABEL(bb, lp);
Index: sys/arch/atari/atari/le_bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/le_bus.c,v
retrieving revision 1.13
diff -u -p -r1.13 le_bus.c
--- sys/arch/atari/atari/le_bus.c	28 Apr 2008 20:23:14 -0000	1.13
+++ sys/arch/atari/atari/le_bus.c	19 Dec 2008 18:57:46 -0000
@@ -269,7 +269,7 @@ bus_space_tag_t	storage;
 	    if ((leb_t = malloc(sizeof(*leb_t), M_TEMP, M_NOWAIT)) == NULL)
 		return(NULL);
 	}
-	bzero(leb_t, sizeof(*leb_t));
+	memset(leb_t, 0, sizeof(*leb_t));
 	
 	leb_t->abs_p_1   = leb_bus_space_peek_1;
 	leb_t->abs_p_2   = leb_bus_space_peek_2;
Index: sys/arch/atari/atari/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/pmap.c,v
retrieving revision 1.109
diff -u -p -r1.109 pmap.c
--- sys/arch/atari/atari/pmap.c	19 Dec 2008 18:49:38 -0000	1.109
+++ sys/arch/atari/atari/pmap.c	19 Dec 2008 18:57:46 -0000
@@ -2443,7 +2443,7 @@ pmap_enter_ptpage(pmap, va, can_fail)
 				panic("enter_pt: out of address space");
 			pmap->pm_stfree &= ~l2tobm(ix);
 			addr = (void *)&pmap->pm_stab[ix * SG4_LEV2SIZE];
-			bzero(addr, SG4_LEV2SIZE * sizeof(st_entry_t));
+			memset(addr, 0, SG4_LEV2SIZE * sizeof(st_entry_t));
 			addr = (void *)&pmap->pm_stpa[ix * SG4_LEV2SIZE];
 			*ste = (u_int) addr | SG_RW | SG_U | SG_V;
 #ifdef DEBUG
@@ -2501,7 +2501,7 @@ pmap_enter_ptpage(pmap, va, can_fail)
 		kpt->kpt_next = kpt_used_list;
 		kpt_used_list = kpt;
 		ptpa = kpt->kpt_pa;
-		bzero((char *)kpt->kpt_va, PAGE_SIZE);
+		memset((char *)kpt->kpt_va, 0, PAGE_SIZE);
 		pmap_enter(pmap, va, ptpa, VM_PROT_READ | VM_PROT_WRITE,
 		    VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED);
 		pmap_update(pmap);
Index: sys/arch/atari/dev/fd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/fd.c,v
retrieving revision 1.62
diff -u -p -r1.62 fd.c
--- sys/arch/atari/dev/fd.c	11 Jun 2008 14:35:53 -0000	1.62
+++ sys/arch/atari/dev/fd.c	19 Dec 2008 18:57:46 -0000
@@ -1307,7 +1307,7 @@ fdgetdefaultlabel(sc, lp, part)
 	int part;
 {
 
-	bzero(lp, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
 
 	lp->d_secsize     = SECTOR_SIZE;
 	lp->d_ntracks     = sc->nheads;
Index: sys/arch/atari/dev/grfabs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/grfabs.c,v
retrieving revision 1.13
diff -u -p -r1.13 grfabs.c
--- sys/arch/atari/dev/grfabs.c	11 Dec 2005 12:16:54 -0000	1.13
+++ sys/arch/atari/dev/grfabs.c	19 Dec 2008 18:57:47 -0000
@@ -181,7 +181,7 @@ colormap_t	*cm;
 	/*
 	 * Copy the colors
 	 */
-	bzero(cm->entry, cm->size * sizeof(long));
+	memset(cm->entry, 0, cm->size * sizeof(long));
 	for (i = 0; i < n; i++)
 		cm->entry[i] = gcm->entry[i];
 	return (0);
Index: sys/arch/atari/dev/grfabs_fal.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/grfabs_fal.c,v
retrieving revision 1.18
diff -u -p -r1.18 grfabs_fal.c
--- sys/arch/atari/dev/grfabs_fal.c	11 Dec 2005 12:16:54 -0000	1.18
+++ sys/arch/atari/dev/grfabs_fal.c	19 Dec 2008 18:57:47 -0000
@@ -607,7 +607,7 @@ u_char	depth;
 	bm->lin_base      = 0;
 	bm->vga_base      = 0;
 
-	bzero(bm->plane, bm_size);
+	memset(bm->plane, 0, bm_size);
 	return (bm);
 }
 
Index: sys/arch/atari/dev/grfabs_tt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/grfabs_tt.c,v
retrieving revision 1.15
diff -u -p -r1.15 grfabs_tt.c
--- sys/arch/atari/dev/grfabs_tt.c	11 Dec 2005 12:16:54 -0000	1.15
+++ sys/arch/atari/dev/grfabs_tt.c	19 Dec 2008 18:57:47 -0000
@@ -376,7 +376,7 @@ u_char	depth;
 	bm->vga_mappable  = 0;
 	bm->vga_base      = 0;
 
-	bzero(bm->plane, bm_size);
+	memset(bm->plane, 0, bm_size);
 	return (bm);
 }
 
Index: sys/arch/atari/dev/hdfd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/hdfd.c,v
retrieving revision 1.64
diff -u -p -r1.64 hdfd.c
--- sys/arch/atari/dev/hdfd.c	18 Dec 2008 10:58:17 -0000	1.64
+++ sys/arch/atari/dev/hdfd.c	19 Dec 2008 18:57:47 -0000
@@ -1453,7 +1453,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
 		fd_formb->fd_formb_gaplen = fd->sc_type->gap2;
 		fd_formb->fd_formb_fillbyte = fd->sc_type->fillbyte;
 
-		bzero(il,sizeof il);
+		memset(il, 0,sizeof il);
 		for (j = 0, i = 1; i <= fd_formb->fd_formb_nsecs; i++) {
 			while (il[(j%fd_formb->fd_formb_nsecs)+1])
 				j++;
@@ -1501,7 +1501,7 @@ fdformat(dev_t dev, struct ne7_fd_formb 
 	bp = getiobuf(NULL, false);
 	if(bp == 0)
 		return ENOBUFS;
-	bzero((void *)bp, sizeof(struct buf));
+	memset((void *)bp, 0, sizeof(struct buf));
 	bp->b_flags = B_PHYS | B_FORMAT;
 	bp->b_cflags |= BC_BUSY;
 	bp->b_proc = p;
@@ -1562,8 +1562,8 @@ dev_t		dev;
 
 	lp   = fd->sc_dk.dk_label;
 
-	bzero(lp, sizeof(*lp));
-	bzero(&cpulab, sizeof(cpulab));
+	memset(lp, 0, sizeof(*lp));
+	memset(&cpulab, 0, sizeof(cpulab));
 
 	lp->d_secpercyl  = fd->sc_type->seccyl;
 	lp->d_type       = DTYPE_FLOPPY;
@@ -1601,7 +1601,7 @@ fdgetdefaultlabel(fd, lp, part)
 	struct disklabel *lp;
 	int part;
 {
-	bzero(lp, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
 
 	lp->d_secsize     = 128 * (1 << fd->sc_type->secsize);
 	lp->d_ntracks     = fd->sc_type->heads;
Index: sys/arch/atari/dev/ite.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/ite.c,v
retrieving revision 1.59
diff -u -p -r1.59 ite.c
--- sys/arch/atari/dev/ite.c	11 Jun 2008 14:35:53 -0000	1.59
+++ sys/arch/atari/dev/ite.c	19 Dec 2008 18:57:47 -0000
@@ -809,7 +809,7 @@ ite_reset(ip)
 	ip->keypad_appmode = 0;
 	ip->imode = 0;
 	ip->key_repeat = 1;
-	bzero(ip->tabs, ip->cols);
+	memset(ip->tabs, 0, ip->cols);
 	for (i = 0; i < ip->cols; i++)
 		ip->tabs[i] = ((i & 7) == 0);
 }
Index: sys/arch/atari/dev/ite_cc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/ite_cc.c,v
retrieving revision 1.27
diff -u -p -r1.27 ite_cc.c
--- sys/arch/atari/dev/ite_cc.c	4 Mar 2007 05:59:40 -0000	1.27
+++ sys/arch/atari/dev/ite_cc.c	19 Dec 2008 18:57:47 -0000
@@ -346,10 +346,11 @@ register struct ite_softc *ip;
 
 	if(!atari_realconfig)
 		ip->priv = cci = &con_ipriv;
-	else ip->priv = cci = (ipriv_t*)malloc(sizeof(*cci), M_DEVBUF,M_WAITOK);
-	if(cci == NULL)
+	else
+		ip->priv = cci = malloc(sizeof(*cci), M_DEVBUF,M_WAITOK);
+	if (cci == NULL)
 		panic("No memory for ite-view");
-	bzero(cci, sizeof(*cci));
+	memset(cci, 0, sizeof(*cci));
 
 	cci->cursor_opt    = 0;
 	cci->row_ptr       = NULL;
@@ -625,7 +626,7 @@ clear8(struct ite_softc *ip, int sy, int
 			int		i;
 			u_char	*ptr = cci->row_ptr[sy]; 
 			for(i = 0; i < ip->font.height; i++) {
-				bzero(ptr, bm->bytes_per_row);
+				memset(ptr, 0, bm->bytes_per_row);
 				ptr += bm->bytes_per_row;
 			}
 			sy++;
Index: sys/arch/atari/dev/ite_et.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/ite_et.c,v
retrieving revision 1.20
diff -u -p -r1.20 ite_et.c
--- sys/arch/atari/dev/ite_et.c	4 Mar 2007 05:59:40 -0000	1.20
+++ sys/arch/atari/dev/ite_et.c	19 Dec 2008 18:57:47 -0000
@@ -320,7 +320,7 @@ register struct ite_softc *ip;
 	else ip->priv = cci = (ipriv_t*)malloc(sizeof(*cci), M_DEVBUF,M_WAITOK);
 	if(cci == NULL)
 		panic("No memory for ite-view");
-	bzero(cci, sizeof(*cci));
+	memset(cci, 0, sizeof(*cci));
 
 	wsz.x      = ite_default_x;
 	wsz.y      = ite_default_y;
Index: sys/arch/atari/dev/ncr5380.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/ncr5380.c,v
retrieving revision 1.57
diff -u -p -r1.57 ncr5380.c
--- sys/arch/atari/dev/ncr5380.c	15 Nov 2008 21:35:31 -0000	1.57
+++ sys/arch/atari/dev/ncr5380.c	19 Dec 2008 18:57:48 -0000
@@ -1635,7 +1635,7 @@ int	linked;
 			else reqp->xcmd.bytes[sizeof(sense_cmd)-2] |= 1;
 
 #ifdef DBG_REQ
-			bzero(reqp->xdata_ptr, reqp->xdata_len);
+			memset(reqp->xdata_ptr, 0, reqp->xdata_len);
 			if (dbg_target_mask & (1 << reqp->targ_id))
 				show_request(reqp, "AUTO-SENSE");
 #endif
Index: sys/arch/atari/stand/bootxx/bootxx.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/bootxx/bootxx.c,v
retrieving revision 1.12
diff -u -p -r1.12 bootxx.c
--- sys/arch/atari/stand/bootxx/bootxx.c	11 Dec 2005 12:17:00 -0000	1.12
+++ sys/arch/atari/stand/bootxx/bootxx.c	19 Dec 2008 18:57:48 -0000
@@ -57,7 +57,7 @@ bootxx(void *readsector, void *disklabel
 	osdsc_t		*od = &os_desc;
 	bxxx_t		bootxxx = (bxxx_t)(LOADADDR3);
 
-	bzero(edata, end - edata);
+	memset(edata, 0, end - edata);
 	setheap(end, (void*)(LOADADDR3 - 4));
 
 	printf("\033v\nNetBSD/atari secondary bootloader"
Index: sys/arch/atari/stand/bootxxx/bootxxx.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/bootxxx/bootxxx.c,v
retrieving revision 1.3
diff -u -p -r1.3 bootxxx.c
--- sys/arch/atari/stand/bootxxx/bootxxx.c	11 Dec 2005 12:17:00 -0000	1.3
+++ sys/arch/atari/stand/bootxxx/bootxxx.c	19 Dec 2008 18:57:48 -0000
@@ -56,7 +56,7 @@ bootxxx(readsector, disklabel, od)
 	char		*errmsg;
 	extern char	end[], edata[];
 
-	bzero(edata, end - edata);
+	memset(edata, 0, end - edata);
 
 	/* XXX: Limit should be 16MB */
 	setheap(end, (void*)0x1000000);
Index: sys/arch/atari/stand/tostools/libtos/aout.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/tostools/libtos/aout.c,v
retrieving revision 1.10
diff -u -p -r1.10 aout.c
--- sys/arch/atari/stand/tostools/libtos/aout.c	28 Apr 2008 20:23:15 -0000	1.10
+++ sys/arch/atari/stand/tostools/libtos/aout.c	19 Dec 2008 18:57:48 -0000
@@ -131,7 +131,7 @@ aout_load(int fd, osdsc_t *od, char **er
 	if ((read(fd, (char *)(od->kstart), ehdr.a_text) != ehdr.a_text)
 	    ||(read(fd,(char *)(od->kstart+textsz),ehdr.a_data) != ehdr.a_data))
 		goto error;
-	bzero(od->kstart + textsz + ehdr.a_data, ehdr.a_bss);
+	memset(od->kstart + textsz + ehdr.a_data, 0, ehdr.a_bss);
 
 	/*
 	 * Read symbol and string table
Index: sys/arch/atari/stand/tostools/libtos/cread.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/tostools/libtos/cread.c,v
retrieving revision 1.4
diff -u -p -r1.4 cread.c
--- sys/arch/atari/stand/tostools/libtos/cread.c	11 Dec 2005 12:17:00 -0000	1.4
+++ sys/arch/atari/stand/tostools/libtos/cread.c	19 Dec 2008 18:57:48 -0000
@@ -248,7 +248,7 @@ copen(fname, mode)
 	ss[fd] = s = malloc(sizeof(struct sd));
 	if (s == 0)
 		goto errout;
-	bzero(s, sizeof(struct sd));
+	memset(s, 0, sizeof(struct sd));
 
 	if (inflateInit2(&(s->stream), -15) != Z_OK)
 		goto errout;
@@ -413,7 +413,7 @@ clseek(fd, offset, where)
 			inflateEnd(&(s->stream));
 
 			sav_inbuf = s->inbuf; /* don't allocate again */
-			bzero(s, sizeof(struct sd)); /* this resets total_out to 0! */
+			memset(s, 0, sizeof(struct sd)); /* this resets total_out to 0! */
 
 			inflateInit2(&(s->stream), -15);
 			s->stream.next_in = s->inbuf = sav_inbuf;
Index: sys/arch/atari/stand/tostools/libtos/elf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/tostools/libtos/elf.c,v
retrieving revision 1.8
diff -u -p -r1.8 elf.c
--- sys/arch/atari/stand/tostools/libtos/elf.c	28 Apr 2008 20:23:15 -0000	1.8
+++ sys/arch/atari/stand/tostools/libtos/elf.c	19 Dec 2008 18:57:48 -0000
@@ -162,7 +162,7 @@ int	loadsyms;
 		if (read(fd, p, php->p_filesz) != php->p_filesz)
 		    goto error;
 		if (php->p_memsz > php->p_filesz)
-		    bzero(p + php->p_filesz, php->p_memsz - php->p_filesz);
+		    memset(p + php->p_filesz, 0, php->p_memsz - php->p_filesz);
 	    }
 	}
 
Index: sys/arch/bebox/bebox/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/bebox/mainbus.c,v
retrieving revision 1.23
diff -u -p -r1.23 mainbus.c
--- sys/arch/bebox/bebox/mainbus.c	16 Mar 2008 17:39:56 -0000	1.23
+++ sys/arch/bebox/bebox/mainbus.c	19 Dec 2008 18:57:48 -0000
@@ -145,7 +145,7 @@ mainbus_attach(struct device *parent, st
 #endif /* NPCI */
 
 #if NPCI > 0
-	bzero(&mba, sizeof(mba));
+	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;
 	mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
Index: sys/arch/evbarm/stand/gzboot/gzboot.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/stand/gzboot/gzboot.c,v
retrieving revision 1.11
diff -u -p -r1.11 gzboot.c
--- sys/arch/evbarm/stand/gzboot/gzboot.c	25 Jan 2006 18:28:26 -0000	1.11
+++ sys/arch/evbarm/stand/gzboot/gzboot.c	19 Dec 2008 18:57:48 -0000
@@ -355,7 +355,7 @@ gzcopy(void *dst, const void *src, size_
 	unsigned char *cp = dst;
 	ssize_t len;
 
-	bzero(&state, sizeof(state));
+	memset(&state, 0, sizeof(state));
 
 	state.z_err = Z_OK;
 	state.srcbuf = src;
Index: sys/arch/hp700/stand/common/dev_hppa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/stand/common/dev_hppa.c,v
retrieving revision 1.8
diff -u -p -r1.8 dev_hppa.c
--- sys/arch/hp700/stand/common/dev_hppa.c	10 May 2008 19:11:59 -0000	1.8
+++ sys/arch/hp700/stand/common/dev_hppa.c	19 Dec 2008 18:57:48 -0000
@@ -116,7 +116,7 @@ devopen(struct open_file *f, const char 
 		printf ("devopen: no mem\n");
 #endif
 	} else {
-		bzero(hpd, sizeof *hpd);
+		memset(hpd, 0, sizeof *hpd);
 		hpd->bootdev = bootdev;
 		hpd->buf = (char *)(((u_int)hpd->ua_buf + IODC_MINIOSIZ-1) &
 			~(IODC_MINIOSIZ-1));
Index: sys/arch/hp700/stand/mkboot/mkboot.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/stand/mkboot/mkboot.c,v
retrieving revision 1.6
diff -u -p -r1.6 mkboot.c
--- sys/arch/hp700/stand/mkboot/mkboot.c	11 Dec 2005 12:17:25 -0000	1.6
+++ sys/arch/hp700/stand/mkboot/mkboot.c	19 Dec 2008 18:57:48 -0000
@@ -161,7 +161,7 @@ main(int argc, char **argv)
 	if ((to = open(to_file, O_RDWR | O_TRUNC | O_CREAT, 0644)) < 0)
 		err(1, "%s: open", to_file);
 
-	bzero(buf, sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 
 	/* record volume info */
 	lifv->vol_id = htobe16(HP700_LIF_VOL_ID);
@@ -320,7 +320,7 @@ putfile(char *from_file, int to)
 		err(1, "%s", to_file);
 	lseek(to, total - sizeof(load), SEEK_CUR);
 
-	bzero(buf, sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 	/* pad to int */
 	n = sizeof(int) - total % sizeof(int);
 	if (total % sizeof(int)) {
Index: sys/arch/hp700/stand/xxboot/main.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/stand/xxboot/main.c,v
retrieving revision 1.6
diff -u -p -r1.6 main.c
--- sys/arch/hp700/stand/xxboot/main.c	9 Apr 2008 19:18:25 -0000	1.6
+++ sys/arch/hp700/stand/xxboot/main.c	19 Dec 2008 18:57:48 -0000
@@ -445,7 +445,7 @@ xi_load(inf, buf)
 	memmove(buf, inf->sec_image, inf->sec_size);
 
 #if 0	/* XXX bss clear is done by the secondary boot itself */
-	bzero((char *) buf + inf->sec_size, inf->sec_pad);
+	memset((char *) buf + inf->sec_size, 0, inf->sec_pad);
 #endif
 
 	return 0;
Index: sys/arch/hpc/hpc/platid_test.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpc/hpc/platid_test.c,v
retrieving revision 1.2
diff -u -p -r1.2 platid_test.c
--- sys/arch/hpc/hpc/platid_test.c	24 Sep 2001 14:29:31 -0000	1.2
+++ sys/arch/hpc/hpc/platid_test.c	19 Dec 2008 18:57:48 -0000
@@ -44,7 +44,7 @@ platid_bit_test()
 	int err_count = 0;
 	int verbose = 0;
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.cpu_arch = ~0;
 	if (pid.dw.dw0 != PLATID_CPU_ARCH_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -52,7 +52,7 @@ platid_bit_test()
 		printf("%14s: %08lx00000000\n", "", PLATID_CPU_ARCH_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.cpu_series = ~0;
 	if (pid.dw.dw0 != PLATID_CPU_SERIES_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -60,7 +60,7 @@ platid_bit_test()
 		printf("%14s: %08lx00000000\n", "", PLATID_CPU_SERIES_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.cpu_model = ~0;
 	if (pid.dw.dw0 != PLATID_CPU_MODEL_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -68,7 +68,7 @@ platid_bit_test()
 		printf("%14s: %08lx00000000\n", "", PLATID_CPU_MODEL_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.cpu_submodel = ~0;
 	if (pid.dw.dw0 != PLATID_CPU_SUBMODEL_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -76,7 +76,7 @@ platid_bit_test()
 		printf("%14s: %08lx00000000\n", "", PLATID_CPU_SUBMODEL_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.flags = ~0;
 	if (pid.dw.dw0 != PLATID_FLAGS_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -84,7 +84,7 @@ platid_bit_test()
 		printf("%14s: %08lx00000000\n", "", PLATID_FLAGS_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.vendor = ~0;
 	if (pid.dw.dw1 != PLATID_VENDOR_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -92,7 +92,7 @@ platid_bit_test()
 		printf("%14s: 00000000%08lx\n", "", PLATID_VENDOR_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.series = ~0;
 	if (pid.dw.dw1 != PLATID_SERIES_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -100,7 +100,7 @@ platid_bit_test()
 		printf("%14s: 00000000%08lx\n", "", PLATID_SERIES_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.model = ~0;
 	if (pid.dw.dw1 != PLATID_MODEL_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
@@ -108,7 +108,7 @@ platid_bit_test()
 		printf("%14s: 00000000%08lx\n", "", PLATID_MODEL_MASK);
 	}
 
-	bzero((char*)&pid, sizeof(pid));
+	memset((char*)&pid, 0, sizeof(pid));
 	pid.s.submodel = ~0;
 	if (pid.dw.dw1 != PLATID_SUBMODEL_MASK && err_count++ || verbose) {
 		platid_hton(&pid);
Index: sys/arch/hpcmips/dev/ite8181.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/dev/ite8181.c,v
retrieving revision 1.25
diff -u -p -r1.25 ite8181.c
--- sys/arch/hpcmips/dev/ite8181.c	4 Mar 2007 05:59:52 -0000	1.25
+++ sys/arch/hpcmips/dev/ite8181.c	19 Dec 2008 18:57:49 -0000
@@ -519,7 +519,7 @@ ite8181_fbinit(struct hpcfb_fbconf *fb)
 	}
 
 	/* zero fill */
-	bzero(fb, sizeof(*fb));
+	memset(fb, 0, sizeof(*fb));
 
 	fb->hf_conf_index	= 0;	/* configuration index		*/
 	fb->hf_nconfs		= 1;   	/* how many configurations	*/
Index: sys/arch/hpcmips/dev/mq200.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/dev/mq200.c,v
retrieving revision 1.28
diff -u -p -r1.28 mq200.c
--- sys/arch/hpcmips/dev/mq200.c	4 Mar 2007 05:59:52 -0000	1.28
+++ sys/arch/hpcmips/dev/mq200.c	19 Dec 2008 18:57:49 -0000
@@ -338,7 +338,7 @@ mq200_fbinit(struct hpcfb_fbconf *fb)
 	}
 
 	/* zero fill */
-	bzero(fb, sizeof(*fb));
+	memset(fb, 0, sizeof(*fb));
 
 	fb->hf_conf_index	= 0;	/* configuration index		*/
 	fb->hf_nconfs		= 1;   	/* how many configurations	*/
Index: sys/arch/hpcmips/hpcmips/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/hpcmips/bus_dma.c,v
retrieving revision 1.32
diff -u -p -r1.32 bus_dma.c
--- sys/arch/hpcmips/hpcmips/bus_dma.c	4 Jun 2008 12:41:41 -0000	1.32
+++ sys/arch/hpcmips/hpcmips/bus_dma.c	19 Dec 2008 18:57:49 -0000
@@ -102,7 +102,7 @@ _hpcmips_bd_map_create(bus_dma_tag_t t, 
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct bus_dmamap_hpcmips *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
Index: sys/arch/hpcmips/hpcmips/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/hpcmips/machdep.c,v
retrieving revision 1.100
diff -u -p -r1.100 machdep.c
--- sys/arch/hpcmips/hpcmips/machdep.c	19 Dec 2008 17:11:57 -0000	1.100
+++ sys/arch/hpcmips/hpcmips/machdep.c	19 Dec 2008 18:57:49 -0000
@@ -291,7 +291,7 @@ mach_init(int argc, char *argv[], struct
 		}
 		esym = (char*)esym + symbolsz;
 		kernend = (void *)mips_round_page(esym);
-		bzero(edata, end - edata);
+		memset(edata, 0, end - edata);
 	} else
 #endif /* NKSYMS || defined(DDB) || defined(MODULAR) */
 	{
Index: sys/arch/i386/pci/glxsb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/glxsb.c,v
retrieving revision 1.6
diff -u -p -r1.6 glxsb.c
--- sys/arch/i386/pci/glxsb.c	5 May 2008 11:49:40 -0000	1.6
+++ sys/arch/i386/pci/glxsb.c	19 Dec 2008 18:57:49 -0000
@@ -332,7 +332,7 @@ glxsb_crypto_newsession(void *aux, uint3
 			return (ENOMEM);
 		if (sesn != 0) {
 			bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
-			bzero(sc->sc_sessions, sesn * sizeof(*ses));
+			memset(sc->sc_sessions, 0, sesn * sizeof(*ses));
 			free(sc->sc_sessions, M_DEVBUF);
 		}
 		sc->sc_sessions = ses;
@@ -340,7 +340,7 @@ glxsb_crypto_newsession(void *aux, uint3
 		sc->sc_nsessions++;
 	}
 
-	bzero(ses, sizeof(*ses));
+	memset(ses, 0, sizeof(*ses));
 	ses->ses_used = 1;
 
 	arc4randbytes(ses->ses_iv, sizeof(ses->ses_iv));
@@ -365,7 +365,7 @@ glxsb_crypto_freesession(void *aux, uint
 	sesn = GLXSB_SESSION(sid);
 	if (sesn >= sc->sc_nsessions)
 		return (EINVAL);
-	bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
+	memset(&sc->sc_sessions[sesn], 0, sizeof(sc->sc_sessions[sesn]));
 	return (0);
 }
 
@@ -588,7 +588,7 @@ glxsb_crypto_process(void *aux, struct c
 
 	/* All AES processing has now been done. */
 
-	bzero(sc->sc_dma.dma_vaddr, xlen * 2);
+	memset(sc->sc_dma.dma_vaddr, 0, xlen * 2);
 out:
 	crp->crp_etype = err;
 	crypto_done(crp);
Index: sys/arch/i386/stand/lib/bootmenu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/stand/lib/bootmenu.c,v
retrieving revision 1.4
diff -u -p -r1.4 bootmenu.c
--- sys/arch/i386/stand/lib/bootmenu.c	14 Dec 2008 18:46:33 -0000	1.4
+++ sys/arch/i386/stand/lib/bootmenu.c	19 Dec 2008 18:57:49 -0000
@@ -104,7 +104,7 @@ parsebootconf(const char *conf)
 	char *key, *value, *v2;
 
 	/* Clear bootconf structure */
-	bzero((void *)&bootconf, sizeof(bootconf));
+	memset((void *)&bootconf, 0, sizeof(bootconf));
 
 	/* Set timeout to configured */
 	bootconf.timeout = boot_params.bp_timeout;
Index: sys/arch/i386/stand/pxeboot/pxe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/stand/pxeboot/pxe.c,v
retrieving revision 1.10
diff -u -p -r1.10 pxe.c
--- sys/arch/i386/stand/pxeboot/pxe.c	14 Apr 2006 05:32:26 -0000	1.10
+++ sys/arch/i386/stand/pxeboot/pxe.c	19 Dec 2008 18:57:50 -0000
@@ -160,7 +160,7 @@ readudp(struct iodesc *d, void *pkt, siz
 	uh = (struct udphdr *)pkt - 1;
 	ip = (struct ip *)uh - 1;
 
-	bzero(ur, sizeof(*ur));
+	memset(ur, 0, sizeof(*ur));
 
 	ur->dest_ip = d->myip.s_addr;
 	ur->d_port = d->myport;
@@ -210,7 +210,7 @@ pxe_netif_open()
 	}
 	BI_ADD(&bi_netif, BTINFO_NETIF, sizeof(bi_netif));
 
-	bzero(uo, sizeof(*uo));
+	memset(uo, 0, sizeof(*uo));
 
 	uo->src_ip = bootplayer.yip;
 
@@ -384,7 +384,7 @@ pxe_init(void)
 	/*
 	 * Get the cached info from the server's Discovery reply packet.
 	 */
-	bzero(gci, sizeof(*gci));
+	memset(gci, 0, sizeof(*gci));
 	gci->PacketType = PXENV_PACKET_TYPE_BINL_REPLY;
 	pxe_call(PXENV_GET_CACHED_INFO);
 	if (gci->Status != PXENV_STATUS_SUCCESS) {
@@ -398,7 +398,7 @@ pxe_init(void)
 	/*
 	 * Get network interface information.
 	 */
-	bzero(gnt, sizeof(*gnt));
+	memset(gnt, 0, sizeof(*gnt));
 	pxe_call(PXENV_UNDI_GET_NIC_TYPE);
 
 	if (gnt->Status != PXENV_STATUS_SUCCESS) {
Index: sys/arch/ia64/ia64/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/ia64/machdep.c,v
retrieving revision 1.12
diff -u -p -r1.12 machdep.c
--- sys/arch/ia64/ia64/machdep.c	30 Nov 2008 18:21:34 -0000	1.12
+++ sys/arch/ia64/ia64/machdep.c	19 Dec 2008 18:57:50 -0000
@@ -470,7 +470,7 @@ ia64_init()
 	bootinfo = *(struct bootinfo *)(IA64_PHYS_TO_RR7(pa_bootinfo));
 
 	if (bootinfo.bi_magic != BOOTINFO_MAGIC || bootinfo.bi_version != 1) {
-		bzero(&bootinfo, sizeof(bootinfo));
+		memset(&bootinfo, 0, sizeof(bootinfo));
 		bootinfo.bi_kernend = (vaddr_t) round_page((vaddr_t)&end);
 	}
 
@@ -792,10 +792,10 @@ setregs(register struct lwp *l, struct e
 	 */
 	KASSERT((tf->tf_special.ndirty & ~PAGE_MASK) == 0);
 
-	bzero(&tf->tf_special, sizeof(tf->tf_special));
+	memset(&tf->tf_special, 0, sizeof(tf->tf_special));
 	if ((tf->tf_flags & FRAME_SYSCALL) == 0) {	/* break syscalls. */
-		bzero(&tf->tf_scratch, sizeof(tf->tf_scratch));
-		bzero(&tf->tf_scratch_fp, sizeof(tf->tf_scratch_fp));
+		memset(&tf->tf_scratch, 0, sizeof(tf->tf_scratch));
+		memset(&tf->tf_scratch_fp, 0, sizeof(tf->tf_scratch_fp));
 		tf->tf_special.cfm = (1UL<<63) | (3UL<<7) | 3UL;
 		tf->tf_special.bspstore = IA64_BACKINGSTORE;
 		/*
Index: sys/arch/ia64/ia64/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/ia64/pmap.c,v
retrieving revision 1.15
diff -u -p -r1.15 pmap.c
--- sys/arch/ia64/ia64/pmap.c	10 Dec 2008 11:10:18 -0000	1.15
+++ sys/arch/ia64/ia64/pmap.c	19 Dec 2008 18:57:50 -0000
@@ -930,7 +930,7 @@ void
 pmap_zero_page(paddr_t phys)
 {
 	vaddr_t va = IA64_PHYS_TO_RR7(phys);
-	bzero((void *) va, PAGE_SIZE);
+	memset((void *) va, 0, PAGE_SIZE);
 }
 
 /*
Index: sys/arch/ia64/stand/common/calloc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/common/calloc.c,v
retrieving revision 1.1
diff -u -p -r1.1 calloc.c
--- sys/arch/ia64/stand/common/calloc.c	7 Apr 2006 14:21:29 -0000	1.1
+++ sys/arch/ia64/stand/common/calloc.c	19 Dec 2008 18:57:50 -0000
@@ -12,7 +12,7 @@ calloc(u_int size1, u_int size2)
 	void *ptr;
 
 	if(( (ptr = alloc(total_size)) != NULL)) {
-		bzero(ptr, total_size);
+		memset(ptr, 0, total_size);
 	}
 	
 	/* alloc will crib for me. */
Index: sys/arch/ia64/stand/common/fileload.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/common/fileload.c,v
retrieving revision 1.1
diff -u -p -r1.1 fileload.c
--- sys/arch/ia64/stand/common/fileload.c	7 Apr 2006 14:21:29 -0000	1.1
+++ sys/arch/ia64/stand/common/fileload.c	19 Dec 2008 18:57:50 -0000
@@ -265,10 +265,10 @@ file_alloc(void)
     struct preloaded_file	*fp;
     
     if ((fp = alloc(sizeof(struct preloaded_file))) != NULL) {
-	bzero(fp, sizeof(struct preloaded_file));
+	memset(fp, 0, sizeof(struct preloaded_file));
 
 	if (fp->marks = alloc(sizeof(u_long))) {
-		bzero(fp->marks, sizeof(u_long));
+		memset(fp->marks, 0, sizeof(u_long));
 	}
     }
     return (fp);
Index: sys/arch/ia64/stand/common/misc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/common/misc.c,v
retrieving revision 1.3
diff -u -p -r1.3 misc.c
--- sys/arch/ia64/stand/common/misc.c	4 Mar 2007 06:00:03 -0000	1.3
+++ sys/arch/ia64/stand/common/misc.c	19 Dec 2008 18:57:50 -0000
@@ -101,7 +101,7 @@ kern_bzero(vaddr_t dest, size_t len)
 	char buf[256];
 	size_t chunk, resid;
 
-	bzero(buf, sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 	resid = len;
 	while (resid > 0) {
 		chunk = min(sizeof(buf), resid);
Index: sys/arch/ia64/stand/efi/libefi/efifs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/efi/libefi/efifs.c,v
retrieving revision 1.2
diff -u -p -r1.2 efifs.c
--- sys/arch/ia64/stand/efi/libefi/efifs.c	22 Apr 2006 07:58:53 -0000	1.2
+++ sys/arch/ia64/stand/efi/libefi/efifs.c	19 Dec 2008 18:57:50 -0000
@@ -231,7 +231,7 @@ efifs_stat(struct open_file *f, struct s
 	static EFI_GUID infoid = EFI_FILE_INFO_ID;
 	EFI_FILE_INFO *info;
 
-	bzero(sb, sizeof(*sb));
+	memset(sb, 0, sizeof(*sb));
 
 	buf = alloc(1024);
 	sz = 1024;
Index: sys/arch/ia64/stand/efi/libefi/efinet.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/efi/libefi/efinet.c,v
retrieving revision 1.2
diff -u -p -r1.2 efinet.c
--- sys/arch/ia64/stand/efi/libefi/efinet.c	22 Apr 2006 07:58:53 -0000	1.2
+++ sys/arch/ia64/stand/efi/libefi/efinet.c	19 Dec 2008 18:57:50 -0000
@@ -234,7 +234,7 @@ efinet_init_driver()
 	efi_net.netif_nifs = nifs;
 	efi_net.netif_ifs = difs;
 
-	bzero(stats, sizeof(stats));
+	memset(stats, 0, sizeof(stats));
 	for (i = 0; i < nifs; i++) {
 		struct netif_dif *dif = &efi_net.netif_ifs[i];
 		dif->dif_unit = i;
Index: sys/arch/ia64/stand/efi/libefi/exec.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/efi/libefi/exec.c,v
retrieving revision 1.3
diff -u -p -r1.3 exec.c
--- sys/arch/ia64/stand/efi/libefi/exec.c	28 Apr 2008 20:23:26 -0000	1.3
+++ sys/arch/ia64/stand/efi/libefi/exec.c	19 Dec 2008 18:57:50 -0000
@@ -161,7 +161,7 @@ elf64_exec(struct preloaded_file *fp)
 		return (ENOMEM);
 	}
 
-	bzero(bi, sizeof(struct bootinfo));
+	memset(bi, 0, sizeof(struct bootinfo));
 	bi_load(bi, fp, &mapkey, pages);
 
 	printf("Entering %s at 0x%lx...\n", fp->f_name, fp->marks[MARK_ENTRY]);
Index: sys/arch/ia64/stand/ia64/efi/main.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/ia64/efi/main.c,v
retrieving revision 1.4
diff -u -p -r1.4 main.c
--- sys/arch/ia64/stand/ia64/efi/main.c	6 Apr 2008 07:50:04 -0000	1.4
+++ sys/arch/ia64/stand/ia64/efi/main.c	19 Dec 2008 18:57:50 -0000
@@ -427,7 +427,7 @@ print_trs(int type)
 	for (i = 0; i <= maxtr; i++) {
 		char lbuf[128];
 
-		bzero(&buf, sizeof(buf));
+		memset(&buf, 0, sizeof(buf));
 		res = ia64_call_pal_stacked(PAL_VM_TR_READ, i, type,
 					    (u_int64_t) &buf);
 		if (res.pal_status != 0)
Index: sys/arch/ia64/stand/ia64/ski/exec.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/ia64/ski/exec.c,v
retrieving revision 1.4
diff -u -p -r1.4 exec.c
--- sys/arch/ia64/stand/ia64/ski/exec.c	28 Apr 2008 20:23:26 -0000	1.4
+++ sys/arch/ia64/stand/ia64/ski/exec.c	19 Dec 2008 18:57:50 -0000
@@ -158,7 +158,7 @@ elf64_exec(struct preloaded_file *fp)
 	 * special page reserved in the link map.
 	 */
 	bi = &bootinfo;
-	bzero(bi, sizeof(struct bootinfo));
+	memset(bi, 0, sizeof(struct bootinfo));
 	bi_load(bi, fp);
 
 	/*
@@ -170,7 +170,7 @@ elf64_exec(struct preloaded_file *fp)
 	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (28 << 2));
 	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2));
 
-	bzero(&pte, sizeof(pte));
+	memset(&pte, 0, sizeof(pte));
 	pte.pte_p = 1;
 	pte.pte_ma = PTE_MA_WB;
 	pte.pte_a = 1;
Index: sys/arch/ia64/stand/ia64/ski/skifs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/stand/ia64/ski/skifs.c,v
retrieving revision 1.2
diff -u -p -r1.2 skifs.c
--- sys/arch/ia64/stand/ia64/ski/skifs.c	22 Apr 2006 07:58:53 -0000	1.2
+++ sys/arch/ia64/stand/ia64/ski/skifs.c	19 Dec 2008 18:57:50 -0000
@@ -118,7 +118,7 @@ skifs_seek(struct open_file *f, off_t of
 int
 skifs_stat(struct open_file *f, struct stat *sb)
 {
-	bzero(sb, sizeof(*sb));
+	memset(sb, 0, sizeof(*sb));
 	sb->st_mode = S_IFREG | S_IRUSR;
 	return 0;
 }
Index: sys/arch/ia64/unwind/stackframe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/unwind/stackframe.c,v
retrieving revision 1.3
diff -u -p -r1.3 stackframe.c
--- sys/arch/ia64/unwind/stackframe.c	28 Feb 2007 04:21:51 -0000	1.3
+++ sys/arch/ia64/unwind/stackframe.c	19 Dec 2008 18:57:50 -0000
@@ -896,7 +896,7 @@ void poprecord(struct staterecord *srec,
 	unwind_rsp -= n;
 	memcpy(srec, unwind_rsp, sizeof(struct staterecord));
 #ifdef DEBUG
-	bzero(unwind_rsp, sizeof(struct staterecord) * n);
+	memset(unwind_rsp, 0, sizeof(struct staterecord) * n);
 #endif
 
 }
Index: sys/arch/ibmnws/ibmnws/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/mainbus.c,v
retrieving revision 1.7
diff -u -p -r1.7 mainbus.c
--- sys/arch/ibmnws/ibmnws/mainbus.c	3 Nov 2008 15:13:16 -0000	1.7
+++ sys/arch/ibmnws/ibmnws/mainbus.c	19 Dec 2008 18:57:50 -0000
@@ -135,7 +135,7 @@ mainbus_attach(device_t parent, device_t
 	extent_destroy(memext);
 #endif
 
-	bzero(&mba, sizeof(mba));
+	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;
 	mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
@@ -152,7 +152,7 @@ mainbus_attach(device_t parent, device_t
 	obio_reserve_resource_unmap();
 
 	if (platform->obiodevs != obiodevs_nodev) {
-		bzero(&mba, sizeof(mba));
+		memset(&mba, 0, sizeof(mba));
 		mba.mba_busname = "obio"; /* XXX needs placeholder in pba */
 		mba.mba_pba.pba_iot = &isa_io_space_tag;
 		mba.mba_pba.pba_memt = &isa_mem_space_tag;
Index: sys/arch/luna68k/luna68k/isr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/luna68k/isr.c,v
retrieving revision 1.13
diff -u -p -r1.13 isr.c
--- sys/arch/luna68k/luna68k/isr.c	10 Jul 2008 16:14:16 -0000	1.13
+++ sys/arch/luna68k/luna68k/isr.c	19 Dec 2008 18:57:51 -0000
@@ -191,7 +191,7 @@ isrunlink_vectored(vec)
 		panic("isrunlink_vectored: not vectored interrupt");
 
 	vectab[vec] = badtrap;
-	bzero(&isr_vectored[vec - ISRVECTORED], sizeof(struct isr_vectored));
+	memset(&isr_vectored[vec - ISRVECTORED], 0, sizeof(struct isr_vectored));
 }
 
 /*
Index: sys/arch/luna68k/luna68k/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/luna68k/machdep.c,v
retrieving revision 1.58
diff -u -p -r1.58 machdep.c
--- sys/arch/luna68k/luna68k/machdep.c	30 Nov 2008 18:21:34 -0000	1.58
+++ sys/arch/luna68k/luna68k/machdep.c	19 Dec 2008 18:57:51 -0000
@@ -322,7 +322,7 @@ identifycpu()
 	extern int cputype;
 	const char *cpu;
 
-	bzero(cpu_model, sizeof(cpu_model));
+	memset(cpu_model, 0, sizeof(cpu_model));
 	switch (cputype) {
 	case CPU_68030:
 		cpu = "MC68030 CPU+MMU, MC68882 FPU";
@@ -438,7 +438,7 @@ cpu_init_kcore_hdr()
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	extern char end[];
 
-	bzero(&cpu_kcore_hdr, sizeof(cpu_kcore_hdr)); 
+	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr)); 
 
 	/*
 	 * Initialize the `dispatcher' portion of the header.
Index: sys/arch/mac68k/mac68k/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/machdep.c,v
retrieving revision 1.325
diff -u -p -r1.325 machdep.c
--- sys/arch/mac68k/mac68k/machdep.c	30 Nov 2008 18:21:34 -0000	1.325
+++ sys/arch/mac68k/mac68k/machdep.c	19 Dec 2008 18:57:51 -0000
@@ -596,7 +596,7 @@ cpu_init_kcore_hdr(void)
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	int i;
 
-	bzero(&cpu_kcore_hdr, sizeof(cpu_kcore_hdr));
+	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 
 	/*
 	 * Initialize the `dispatcher' portion of the header.
Index: sys/arch/mac68k/mac68k/macrom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/macrom.c,v
retrieving revision 1.68
diff -u -p -r1.68 macrom.c
--- sys/arch/mac68k/mac68k/macrom.c	5 Jan 2008 00:31:55 -0000	1.68
+++ sys/arch/mac68k/mac68k/macrom.c	19 Dec 2008 18:57:51 -0000
@@ -513,7 +513,7 @@ mrg_NewPtr(void)
 #endif
 		*(u_int32_t *)ptr = numbytes;
 		ptr += 4;
-		bzero(ptr, numbytes); /* NewPtr, Clear ! */
+		memset(ptr, 0, numbytes); /* NewPtr, Clear ! */
 	}
 
 	__asm volatile("movl	%0,%%a0" :  : "g" (ptr) : "a0");
Index: sys/arch/macppc/dev/snapper.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/snapper.c,v
retrieving revision 1.31
diff -u -p -r1.31 snapper.c
--- sys/arch/macppc/dev/snapper.c	16 Dec 2008 22:35:24 -0000	1.31
+++ sys/arch/macppc/dev/snapper.c	19 Dec 2008 18:57:52 -0000
@@ -696,7 +696,7 @@ snapper_match(device_t parent, struct cf
 	    (soundchip = OF_child(soundbus)) == 0)
 		return 0;
 
-	bzero(compat, sizeof compat);
+	memset(compat, 0, sizeof compat);
 	OF_getprop(soundchip, "compatible", compat, sizeof compat);
 
 	if (strcmp(compat, "snapper") == 0)
@@ -733,7 +733,7 @@ snapper_attach(device_t parent, device_t
 	ca = aux;
 
 	soundbus = OF_child(ca->ca_node);
-	bzero(compat, sizeof compat);
+	memset(compat, 0, sizeof compat);
 	OF_getprop(OF_child(soundbus), "compatible", compat, sizeof compat);
 
 	if (strcmp(compat, "tumbler") == 0)
@@ -2035,8 +2035,8 @@ snapper_init(struct snapper_softc *sc, i
 		int intr[2];
 		char *addr;
 
-		bzero(name, sizeof name);
-		bzero(audio_gpio, sizeof audio_gpio);
+		memset(name, 0, sizeof name);
+		memset(audio_gpio, 0, sizeof audio_gpio);
 		addr = 0;
 		OF_getprop(gpio, "name", name, sizeof name);
 		OF_getprop(gpio, "audio-gpio", audio_gpio, sizeof audio_gpio);
Index: sys/arch/macppc/dev/zs_kgdb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/zs_kgdb.c,v
retrieving revision 1.8
diff -u -p -r1.8 zs_kgdb.c
--- sys/arch/macppc/dev/zs_kgdb.c	28 Apr 2008 20:23:27 -0000	1.8
+++ sys/arch/macppc/dev/zs_kgdb.c	19 Dec 2008 18:57:52 -0000
@@ -163,7 +163,7 @@ zs_kgdb_init()
 		channel, kgdb_rate);
 
 	/* Setup temporary chanstate. */
-	bzero((void *)&cs, sizeof(cs));
+	memset((void *)&cs, 0, sizeof(cs));
 	cs.cs_channel = channel;
 	cs.cs_brg_clk = PCLK / 16;
 	cs.cs_reg_csr  = &zc->zc_csr;
Index: sys/arch/mips/sibyte/dev/sbmac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/sibyte/dev/sbmac.c,v
retrieving revision 1.30
diff -u -p -r1.30 sbmac.c
--- sys/arch/mips/sibyte/dev/sbmac.c	13 Nov 2008 19:44:02 -0000	1.30
+++ sys/arch/mips/sibyte/dev/sbmac.c	19 Dec 2008 18:57:52 -0000
@@ -421,7 +421,7 @@ sbdma_initctx(sbmacdma_t *d, struct sbma
 	d->sbdma_dscrtable = (sbdmadscr_t *)
 	    KMALLOC(d->sbdma_maxdescr * sizeof(sbdmadscr_t));
 
-	bzero(d->sbdma_dscrtable, d->sbdma_maxdescr*sizeof(sbdmadscr_t));
+	memset(d->sbdma_dscrtable, 0, d->sbdma_maxdescr*sizeof(sbdmadscr_t));
 
 	d->sbdma_dscrtable_phys = KVTOPHYS(d->sbdma_dscrtable);
 
@@ -432,7 +432,7 @@ sbdma_initctx(sbmacdma_t *d, struct sbma
 	d->sbdma_ctxtable = (struct mbuf **)
 	    KMALLOC(d->sbdma_maxdescr*sizeof(struct mbuf *));
 
-	bzero(d->sbdma_ctxtable, d->sbdma_maxdescr*sizeof(struct mbuf *));
+	memset(d->sbdma_ctxtable, 0, d->sbdma_maxdescr*sizeof(struct mbuf *));
 }
 
 /*
Index: sys/arch/next68k/next68k/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/next68k/machdep.c,v
retrieving revision 1.89
diff -u -p -r1.89 machdep.c
--- sys/arch/next68k/next68k/machdep.c	30 Nov 2008 18:21:35 -0000	1.89
+++ sys/arch/next68k/next68k/machdep.c	19 Dec 2008 18:57:52 -0000
@@ -588,7 +588,7 @@ cpu_init_kcore_hdr(void)
 	int i;
 	extern char end[];
 
-	bzero(&cpu_kcore_hdr, sizeof(cpu_kcore_hdr));
+	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 
 	/*
 	 * Initialize the `dispatcher' portion of the header.
Index: sys/arch/next68k/stand/boot/sd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/stand/boot/sd.c,v
retrieving revision 1.10
diff -u -p -r1.10 sd.c
--- sys/arch/next68k/stand/boot/sd.c	4 Aug 2006 02:09:19 -0000	1.10
+++ sys/arch/next68k/stand/boot/sd.c	19 Dec 2008 18:57:52 -0000
@@ -79,7 +79,7 @@ sdprobe(char target, char lun)
     int error, retries;
     int count;
 
-    bzero(&cdb1, sizeof(cdb1));
+    memset(&cdb1, 0, sizeof(cdb1));
     cdb1.opcode =  SCSI_TEST_UNIT_READY;
 
     retries = 0;
@@ -95,7 +95,7 @@ sdprobe(char target, char lun)
     if (error)
 	return error<0 ? ENODEV : error;
 
-    bzero(&cdb2, sizeof(cdb2));
+    memset(&cdb2, 0, sizeof(cdb2));
     cdb2.opcode = INQUIRY;
     cdb2.length = sizeof(inq);
     count = sizeof (inq);
@@ -125,7 +125,7 @@ sdgetinfo(struct sd_softc *ss)
     int count;
     int sc_blkshift = 0;
 
-    bzero(&cdb, sizeof(cdb));
+    memset(&cdb, 0, sizeof(cdb));
     cdb.opcode = READ_CAPACITY_10;
     count = sizeof(cap);
     error = scsiicmd(ss->sc_unit, ss->sc_lun, (u_char *)&cdb, sizeof(cdb),
@@ -267,7 +267,7 @@ sdstrategy(struct sd_softc *ss, int rw, 
 	    DPRINTF(("sdstrategy: read block %ld, %d bytes (%ld blks a %d bytes).\n",
 		     blk, tsize, nblks, ss->sc_dev_bsize));
 
-	    bzero(&cdb, sizeof(cdb));
+	    memset(&cdb, 0, sizeof(cdb));
 	    cdb.opcode = READ_10;
 	    cdb.addr[0] = (blk & 0xff000000) >> 24;
 	    cdb.addr[1] = (blk & 0xff0000) >> 16;
Index: sys/arch/powerpc/marvell/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/marvell/bus_dma.c,v
retrieving revision 1.17
diff -u -p -r1.17 bus_dma.c
--- sys/arch/powerpc/marvell/bus_dma.c	4 Jun 2008 12:41:41 -0000	1.17
+++ sys/arch/powerpc/marvell/bus_dma.c	19 Dec 2008 18:57:53 -0000
@@ -164,7 +164,7 @@ _bus_dmamap_create(t, size, nsegments, m
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct powerpc_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
Index: sys/arch/powerpc/powerpc/darwin_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/darwin_machdep.c,v
retrieving revision 1.25
diff -u -p -r1.25 darwin_machdep.c
--- sys/arch/powerpc/powerpc/darwin_machdep.c	28 Apr 2008 20:23:32 -0000	1.25
+++ sys/arch/powerpc/powerpc/darwin_machdep.c	19 Dec 2008 18:57:53 -0000
@@ -100,7 +100,7 @@ darwin_sendsig(ksi, mask)
 	sfp = (struct darwin_sigframe *)((u_long)(sfp - 1) & ~0xfUL);
 
 	/* Prepare the signal frame */
-	bzero(&sf, sizeof(sf));
+	memset(&sf, 0, sizeof(sf));
 	sf.dmc.es.dar = tf->dar;
 	sf.dmc.es.dsisr = tf->dsisr;
 	sf.dmc.es.exception = tf->exc;
Index: sys/arch/prep/prep/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/mainbus.c,v
retrieving revision 1.28
diff -u -p -r1.28 mainbus.c
--- sys/arch/prep/prep/mainbus.c	28 Apr 2008 19:01:45 -0000	1.28
+++ sys/arch/prep/prep/mainbus.c	19 Dec 2008 18:57:53 -0000
@@ -167,7 +167,7 @@ mainbus_attach(struct device *parent, st
 #endif /* NPNPBUS */
 
 #if NPCI > 0
-	bzero(&mba, sizeof(mba));
+	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba._pba_busname = NULL;
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;
Index: sys/arch/sbmips/sbmips/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sbmips/sbmips/machdep.c,v
retrieving revision 1.41
diff -u -p -r1.41 machdep.c
--- sys/arch/sbmips/sbmips/machdep.c	30 Nov 2008 18:21:35 -0000	1.41
+++ sys/arch/sbmips/sbmips/machdep.c	19 Dec 2008 18:57:53 -0000
@@ -183,7 +183,7 @@ mach_init(long fwhandle, long magic, lon
 		    sizeof bootinfo);
 	else if (reserved == CFE_EPTSEAL) {
 		magic = BOOTINFO_MAGIC;
-		bzero(&bootinfo, sizeof bootinfo);
+		memset(&bootinfo, 0, sizeof bootinfo);
 		bootinfo.version = BOOTINFO_VERSION;
 		bootinfo.fwhandle = fwhandle;
 		bootinfo.fwentry = bootdata;
Index: sys/arch/sbmips/stand/common/boot.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sbmips/stand/common/boot.c,v
retrieving revision 1.3
diff -u -p -r1.3 boot.c
--- sys/arch/sbmips/stand/common/boot.c	11 Dec 2005 12:18:51 -0000	1.3
+++ sys/arch/sbmips/stand/common/boot.c	19 Dec 2008 18:57:53 -0000
@@ -141,7 +141,7 @@ main(long fwhandle,long fd,long fwentry)
 
 	cfe_flushcache(0);
 
-	bzero(&bootinfo,sizeof(bootinfo));
+	memset(&bootinfo, 0,sizeof(bootinfo));
 	bootinfo.version = BOOTINFO_VERSION;
 	bootinfo.reserved = 0;
 	bootinfo.ssym = marks[MARK_SYM];
Index: sys/arch/shark/ofw/ofw.c
===================================================================
RCS file: /cvsroot/src/sys/arch/shark/ofw/ofw.c,v
retrieving revision 1.44
diff -u -p -r1.44 ofw.c
--- sys/arch/shark/ofw/ofw.c	11 Nov 2008 06:46:44 -0000	1.44
+++ sys/arch/shark/ofw/ofw.c	19 Dec 2008 18:57:54 -0000
@@ -441,7 +441,7 @@ get_fw_dhcp_data(bdp)
 	int chosen;
 	int dhcplen;
 
-	bzero((char *)bdp, sizeof(*bdp));
+	memset((char *)bdp, 0, sizeof(*bdp));
 	if ((chosen = OF_finddevice("/chosen")) == -1)
 		panic("no /chosen from OFW");
 	if ((dhcplen = OF_getproplen(chosen, "bootp-response")) > 0) {
@@ -1329,7 +1329,7 @@ ofw_construct_proc0_addrspace(void)
 		    PAGE_SIZE, -1);	/* XXX - mode? -JJK */
 
 		/* Zero the memory. */
-		bzero((char *)systempage.pv_va, PAGE_SIZE);
+		memset((char *)systempage.pv_va, 0, PAGE_SIZE);
 	}
 
 	/* Allocate/initialize space for the proc0, NetBSD-managed */
@@ -1957,7 +1957,7 @@ ofw_claimpages(free_pp, pv_p, size)
 	ofw_settranslation(va, pa, alloc_size, -1);
 
 	/* The memory's mapped-in now, so we can zero it. */
-	bzero((char *)va, alloc_size);
+	memset((char *)va, 0, alloc_size);
 
 	/* Set OUT parameters. */
 	*free_pp = va;
Index: sys/arch/sparc/dev/fd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/fd.c,v
retrieving revision 1.143
diff -u -p -r1.143 fd.c
--- sys/arch/sparc/dev/fd.c	17 Dec 2008 20:51:32 -0000	1.143
+++ sys/arch/sparc/dev/fd.c	19 Dec 2008 18:57:54 -0000
@@ -2066,7 +2066,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
 		fd_formb->fd_formb_gaplen = fd->sc_type->gap2;
 		fd_formb->fd_formb_fillbyte = fd->sc_type->fillbyte;
 
-		bzero(il, sizeof il);
+		memset(il, 0, sizeof il);
 		for (j = 0, i = 1; i <= fd_formb->fd_formb_nsecs; i++) {
 			while (il[(j%fd_formb->fd_formb_nsecs) + 1])
 				j++;
@@ -2198,8 +2198,8 @@ fdgetdisklabel(dev_t dev)
 	struct disklabel *lp = fd->sc_dk.dk_label;
 	struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel;
 
-	bzero(lp, sizeof(struct disklabel));
-	bzero(lp, sizeof(struct cpu_disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct cpu_disklabel));
 
 	lp->d_type = DTYPE_FLOPPY;
 	lp->d_secsize = FD_BSIZE(fd);
Index: sys/arch/sparc/dev/sbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/sbus.c,v
retrieving revision 1.71
diff -u -p -r1.71 sbus.c
--- sys/arch/sparc/dev/sbus.c	16 Dec 2008 22:35:25 -0000	1.71
+++ sys/arch/sparc/dev/sbus.c	19 Dec 2008 18:57:54 -0000
@@ -440,7 +440,7 @@ sbus_setup_attach_args(struct sbus_softc
 {
 	int n, error;
 
-	bzero(sa, sizeof(struct sbus_attach_args));
+	memset(sa, 0, sizeof(struct sbus_attach_args));
 	error = prom_getprop(node, "name", 1, &n, &sa->sa_name);
 	if (error != 0)
 		return (error);
@@ -497,7 +497,7 @@ sbus_destroy_attach_args(struct sbus_att
 	if (sa->sa_promvaddrs)
 		free(sa->sa_promvaddrs, M_DEVBUF);
 
-	bzero(sa, sizeof(struct sbus_attach_args));/*DEBUG*/
+	memset(sa, 0, sizeof(struct sbus_attach_args));/*DEBUG*/
 }
 
 bus_addr_t
Index: sys/arch/sparc/dev/zs_kgdb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/zs_kgdb.c,v
retrieving revision 1.18
diff -u -p -r1.18 zs_kgdb.c
--- sys/arch/sparc/dev/zs_kgdb.c	28 Apr 2008 20:23:36 -0000	1.18
+++ sys/arch/sparc/dev/zs_kgdb.c	19 Dec 2008 18:57:54 -0000
@@ -153,7 +153,7 @@ zs_kgdb_init(void)
 		   'a' + (kgdb_dev & 3), kgdb_rate);
 
 	/* Setup temporary chanstate. */
-	bzero((void *)&cs, sizeof(cs));
+	memset((void *)&cs, 0, sizeof(cs));
 	zsd = findzs(promzs_unit);
 	if (zsd == NULL) {
 		printf("zs_kgdb_init: zs not mapped.\n");
Index: sys/arch/sparc/sparc/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/autoconf.c,v
retrieving revision 1.231
diff -u -p -r1.231 autoconf.c
--- sys/arch/sparc/sparc/autoconf.c	30 Nov 2008 18:21:36 -0000	1.231
+++ sys/arch/sparc/sparc/autoconf.c	19 Dec 2008 18:57:54 -0000
@@ -502,7 +502,7 @@ bootpath_build(void)
 	/*
 	 * Grab boot path from PROM and split into `bootpath' components.
 	 */
-	bzero(bootpath, sizeof(bootpath));
+	memset(bootpath, 0, sizeof(bootpath));
 	bp = bootpath;
 	cp = prom_getbootpath();
 	switch (prom_version()) {
@@ -974,7 +974,7 @@ cpu_configure(void)
 	 */
 	{
 		extern struct user *proc0paddr;
-		bzero(proc0paddr, sizeof(struct user));
+		memset(proc0paddr, 0, sizeof(struct user));
 	}
 
 	spl0();
@@ -1182,7 +1182,7 @@ extern struct sparc_bus_space_tag mainbu
 #if defined(SUN4)
 	if (CPU_ISSUN4) {
 
-		bzero(&ma, sizeof(ma));
+		memset(&ma, 0, sizeof(ma));
 		/* Configure the CPU. */
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
@@ -1245,7 +1245,7 @@ extern struct sparc_bus_space_tag mainbu
 					continue;
 			}
 
-			bzero(&ma, sizeof(ma));
+			memset(&ma, 0, sizeof(ma));
 			ma.ma_bustag = &mainbus_space_tag;
 			ma.ma_dmatag = &mainbus_dma_tag;
 			ma.ma_node = node;
@@ -1257,7 +1257,7 @@ extern struct sparc_bus_space_tag mainbu
 			}
 		}
 	} else if (CPU_ISSUN4C) {
-		bzero(&ma, sizeof(ma));
+		memset(&ma, 0, sizeof(ma));
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_node = findroot();
@@ -1273,7 +1273,7 @@ extern struct sparc_bus_space_tag mainbu
 			panic(sp);
 		}
 
-		bzero(&ma, sizeof ma);
+		memset(&ma, 0, sizeof ma);
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_name = prom_getpropstringA(node, "name",
@@ -1320,7 +1320,7 @@ extern struct sparc_bus_space_tag mainbu
 		if (sp != NULL)
 			continue; /* an "early" device already configured */
 
-		bzero(&ma, sizeof ma);
+		memset(&ma, 0, sizeof ma);
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_name = prom_getpropstringA(node, "name",
@@ -1383,7 +1383,7 @@ prom_getprop_reg1(int node, struct openp
 		if (error == ENOENT &&
 		    strcmp(prom_getpropstringA(node, "device_type", buf, sizeof buf),
 			   "hierarchical") == 0) {
-			bzero(rrp, sizeof(struct openprom_addr));
+			memset(rrp, 0, sizeof(struct openprom_addr));
 			error = 0;
 		}
 		return (error);
Index: sys/arch/sparc/sparc/core_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/core_machdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 core_machdep.c
--- sys/arch/sparc/sparc/core_machdep.c	19 Nov 2008 18:36:01 -0000	1.1
+++ sys/arch/sparc/sparc/core_machdep.c	19 Dec 2008 18:57:55 -0000
@@ -95,7 +95,7 @@ cpu_coredump(struct lwp *l, void *iocook
 			savefpstate(l->l_md.md_fpstate);
 		md_core.md_fpstate = *l->l_md.md_fpstate;
 	} else
-		bzero((void *)&md_core.md_fpstate, sizeof(struct fpstate));
+		memset((void *)&md_core.md_fpstate, 0, sizeof(struct fpstate));
 
 	CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_MACHINE, CORE_CPU);
 	cseg.c_addr = 0;
Index: sys/arch/sparc/sparc/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/cpu.c,v
retrieving revision 1.212
diff -u -p -r1.212 cpu.c
--- sys/arch/sparc/sparc/cpu.c	19 Dec 2008 18:49:38 -0000	1.212
+++ sys/arch/sparc/sparc/cpu.c	19 Dec 2008 18:57:55 -0000
@@ -232,7 +232,7 @@ alloc_cpuinfo(void)
 	}
 	pmap_update(pmap_kernel());
 
-	bzero((void *)cpi, sz);
+	memset((void *)cpi, 0, sz);
 
 	/*
 	 * Arrange pcb and interrupt stack in the same
Index: sys/arch/sparc/sparc/iommu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/iommu.c,v
retrieving revision 1.90
diff -u -p -r1.90 iommu.c
--- sys/arch/sparc/sparc/iommu.c	4 Jun 2008 12:41:41 -0000	1.90
+++ sys/arch/sparc/sparc/iommu.c	19 Dec 2008 18:57:56 -0000
@@ -289,7 +289,7 @@ iommu_attach(struct device *parent, stru
 		struct iommu_attach_args ia;
 		struct openprom_addr sbus_iommu_reg = { 0, 0x10001000, 0x28 };
 
-		bzero(&ia, sizeof ia);
+		memset(&ia, 0, sizeof ia);
 
 		/* Propagate BUS & DMA tags */
 		ia.iom_bustag = ma->ma_bustag;
@@ -310,7 +310,7 @@ iommu_attach(struct device *parent, stru
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		struct iommu_attach_args ia;
 
-		bzero(&ia, sizeof ia);
+		memset(&ia, 0, sizeof ia);
 		ia.iom_name = prom_getpropstring(node, "name");
 
 		/* Propagate BUS & DMA tags */
Index: sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.285
diff -u -p -r1.285 machdep.c
--- sys/arch/sparc/sparc/machdep.c	25 Nov 2008 15:51:34 -0000	1.285
+++ sys/arch/sparc/sparc/machdep.c	19 Dec 2008 18:57:56 -0000
@@ -386,7 +386,7 @@ setregs(struct lwp *l, struct exec_packa
 		free((void *)fs, M_SUBPROC);
 		l->l_md.md_fpstate = NULL;
 	}
-	bzero((void *)tf, sizeof *tf);
+	memset((void *)tf, 0, sizeof *tf);
 	tf->tf_psr = psr;
 	tf->tf_global[1] = (int)l->l_proc->p_psstr;
 	tf->tf_pc = pack->ep_entry & ~3;
@@ -1300,7 +1300,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct sparc_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
Index: sys/arch/sparc/sparc/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.324
diff -u -p -r1.324 pmap.c
--- sys/arch/sparc/sparc/pmap.c	10 Dec 2008 11:10:19 -0000	1.324
+++ sys/arch/sparc/sparc/pmap.c	19 Dec 2008 18:57:57 -0000
@@ -3112,11 +3112,11 @@ pmap_bootstrap4_4c(void *top, int nctx, 
 #if defined(SUN4_MMU3L)
 	mmuregions = mmureg = (struct mmuentry *)p;
 	p += nregion * sizeof(struct mmuentry);
-	bzero(mmuregions, nregion * sizeof(struct mmuentry));
+	memset(mmuregions, 0, nregion * sizeof(struct mmuentry));
 #endif
 	mmusegments = mmuseg = (struct mmuentry *)p;
 	p += nsegment * sizeof(struct mmuentry);
-	bzero(mmusegments, nsegment * sizeof(struct mmuentry));
+	memset(mmusegments, 0, nsegment * sizeof(struct mmuentry));
 
 	pmap_kernel()->pm_ctx = ctxinfo = ci = (union ctxinfo *)p;
 	p += nctx * sizeof *ci;
@@ -3149,7 +3149,7 @@ pmap_bootstrap4_4c(void *top, int nctx, 
 	 */
 	kptes = (int *)p;
 	p += NKREG * NSEGRG * NPTESG * sizeof(int);
-	bzero(kptes, NKREG * NSEGRG * NPTESG * sizeof(int));
+	memset(kptes, 0, NKREG * NSEGRG * NPTESG * sizeof(int));
 
 	/*
 	 * Set up pm_regmap for kernel to point NUREG *below* the beginning
@@ -3527,8 +3527,8 @@ pmap_bootstrap4m(void *top)
 	 * user regions in the same way.
 	 */
 	kernel_pmap_store.pm_regmap = &kernel_regmap_store[-NUREG];
-	bzero(kernel_regmap_store, NKREG * sizeof(struct regmap));
-	bzero(kernel_segmap_store, NKREG * NSEGRG * sizeof(struct segmap));
+	memset(kernel_regmap_store, 0, NKREG * sizeof(struct regmap));
+	memset(kernel_segmap_store, 0, NKREG * NSEGRG * sizeof(struct segmap));
 	for (i = NKREG; --i >= 0;) {
 		kernel_regmap_store[i].rg_segmap =
 			&kernel_segmap_store[i * NSEGRG];
@@ -3540,16 +3540,16 @@ pmap_bootstrap4m(void *top)
 	/* Allocate kernel region pointer tables */
 	pmap_kernel()->pm_reg_ptps = (int **)(q = p);
 	p += sparc_ncpus * sizeof(int **);
-	bzero((void *)q, (u_int)p - (u_int)q);
+	memset((void *)q, 0, (u_int)p - (u_int)q);
 
 	pmap_kernel()->pm_reg_ptps_pa = (int *)(q = p);
 	p += sparc_ncpus * sizeof(int *);
-	bzero((void *)q, (u_int)p - (u_int)q);
+	memset((void *)q, 0, (u_int)p - (u_int)q);
 
 	/* Allocate context administration */
 	pmap_kernel()->pm_ctx = ctxinfo = ci = (union ctxinfo *)p;
 	p += ncontext * sizeof *ci;
-	bzero((void *)ci, (u_int)p - (u_int)ci);
+	memset((void *)ci, 0, (u_int)p - (u_int)ci);
 
 
 	/*
@@ -4157,7 +4157,7 @@ pmap_pmap_pool_ctor(void *arg, void *obj
 	struct pmap *pm = object;
 	u_long addr;
 
-	bzero(pm, sizeof *pm);
+	memset(pm, 0, sizeof *pm);
 
 	/*
 	 * `pmap_pool' entries include space for the per-CPU
Index: sys/arch/sparc/stand/common/netif_sun.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/stand/common/netif_sun.c,v
retrieving revision 1.9
diff -u -p -r1.9 netif_sun.c
--- sys/arch/sparc/stand/common/netif_sun.c	13 Jul 2006 20:03:34 -0000	1.9
+++ sys/arch/sparc/stand/common/netif_sun.c	19 Dec 2008 18:57:57 -0000
@@ -87,7 +87,7 @@ netif_open(void *machdep_hint)
 		errno = ENFILE;
 		return (-1);
 	}
-	bzero(io, sizeof(*io));
+	memset(io, 0, sizeof(*io));
 
 	netif_prom.nif_devdata = pd;
 	io->io_netif = &netif_prom;
Index: sys/arch/sparc/stand/ofwboot/netif_of.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/stand/ofwboot/netif_of.c,v
retrieving revision 1.5
diff -u -p -r1.5 netif_of.c
--- sys/arch/sparc/stand/ofwboot/netif_of.c	7 May 2008 17:56:09 -0000	1.5
+++ sys/arch/sparc/stand/ofwboot/netif_of.c	19 Dec 2008 18:57:57 -0000
@@ -88,7 +88,7 @@ netif_open(void *machdep_hint)
 		errno = ENFILE;
 		return -1;
 	}
-	bzero(io, sizeof *io);
+	memset(io, 0, sizeof *io);
 
 	netif_of.nif_devdata = op;
 	io->io_netif = &netif_of;
Index: sys/arch/sparc/stand/ofwboot/ofdev.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/stand/ofwboot/ofdev.c,v
retrieving revision 1.20
diff -u -p -r1.20 ofdev.c
--- sys/arch/sparc/stand/ofwboot/ofdev.c	18 May 2008 13:18:19 -0000	1.20
+++ sys/arch/sparc/stand/ofwboot/ofdev.c	19 Dec 2008 18:57:57 -0000
@@ -364,7 +364,7 @@ search_label(struct of_dev *devp, u_long
 		return (disklabel_sun_to_bsd(buf, lp));
 
 
-	bzero(buf, sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 	return ("no disk label");
 }
 
@@ -468,7 +468,7 @@ open_again:
 		return ENXIO;
 	}
 	DPRINTF(("devopen: %s is now open\n", fname));
-	bzero(&ofdev, sizeof ofdev);
+	memset(&ofdev, 0, sizeof ofdev);
 	ofdev.handle = handle;
 	if (!strcmp(b.buf, "block")) {
 		ofdev.type = OFDEV_DISK;
Index: sys/arch/sparc64/dev/fdc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/fdc.c,v
retrieving revision 1.28
diff -u -p -r1.28 fdc.c
--- sys/arch/sparc64/dev/fdc.c	17 Dec 2008 20:51:32 -0000	1.28
+++ sys/arch/sparc64/dev/fdc.c	19 Dec 2008 18:57:58 -0000
@@ -2255,7 +2255,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
 		fd_formb->fd_formb_gaplen = fd->sc_type->gap2;
 		fd_formb->fd_formb_fillbyte = fd->sc_type->fillbyte;
 
-		bzero(il, sizeof il);
+		memset(il, 0, sizeof il);
 		for (j = 0, i = 1; i <= fd_formb->fd_formb_nsecs; i++) {
 			while (il[(j % fd_formb->fd_formb_nsecs) + 1])
 				j++;
@@ -2387,8 +2387,8 @@ fdgetdisklabel(dev_t dev)
 	struct disklabel *lp = fd->sc_dk.dk_label;
 	struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel;
 
-	bzero(lp, sizeof(struct disklabel));
-	bzero(lp, sizeof(struct cpu_disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct cpu_disklabel));
 
 	lp->d_type = DTYPE_FLOPPY;
 	lp->d_secsize = FD_BSIZE(fd);
Index: sys/arch/vax/boot/boot/conf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/conf.c,v
retrieving revision 1.14
diff -u -p -r1.14 conf.c
--- sys/arch/vax/boot/boot/conf.c	11 Dec 2005 12:19:30 -0000	1.14
+++ sys/arch/vax/boot/boot/conf.c	19 Dec 2008 18:57:58 -0000
@@ -101,6 +101,6 @@ nostrategy(void *f, int func, daddr_t db
     size_t size, void *buf, size_t *rsize)
 {
 	*rsize = size;
-	bzero(buf, size);
+	memset(buf, 0, size);
 	return 0;
 }
Index: sys/arch/vax/boot/boot/hp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/hp.c,v
retrieving revision 1.8
diff -u -p -r1.8 hp.c
--- sys/arch/vax/boot/boot/hp.c	11 Dec 2005 12:19:30 -0000	1.8
+++ sys/arch/vax/boot/boot/hp.c	19 Dec 2008 18:57:58 -0000
@@ -87,7 +87,7 @@ hpopen(struct open_file *f, int adapt, i
 		bootrpb.adpphy = adpadr;
 		bootrpb.unit = unit;
 	}
-	bzero(&hplabel, sizeof(struct disklabel));
+	memset(&hplabel, 0, sizeof(struct disklabel));
 
 	hplabel.d_secpercyl = 32;
 	hplabel.d_nsectors = 32;
Index: sys/arch/vax/boot/boot/if_de.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/if_de.c,v
retrieving revision 1.4
diff -u -p -r1.4 if_de.c
--- sys/arch/vax/boot/boot/if_de.c	1 Jul 2006 05:55:34 -0000	1.4
+++ sys/arch/vax/boot/boot/if_de.c	19 Dec 2008 18:57:58 -0000
@@ -122,7 +122,7 @@ deopen(struct open_file *f, int adapt, i
 		map[i] = PG_V | (cdata + i);
 	}
 
-	bzero((char *)dc, sizeof(struct de_cdata));
+	memset((char *)dc, 0, sizeof(struct de_cdata));
 	
 	/* Tell the DEUNA about our PCB */
 	DE_WCSR(DE_PCSR2, LOWORD(pdc));
Index: sys/arch/vax/boot/boot/if_ni.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/if_ni.c,v
retrieving revision 1.4
diff -u -p -r1.4 if_ni.c
--- sys/arch/vax/boot/boot/if_ni.c	4 Mar 2007 06:00:56 -0000	1.4
+++ sys/arch/vax/boot/boot/if_ni.c	19 Dec 2008 18:57:58 -0000
@@ -84,7 +84,7 @@
 #define SPTSIZ	16384	/* 8MB */
 #define roundpg(x)	(((int)x + VAX_PGOFSET) & ~VAX_PGOFSET)
 #define ALLOC(x) \
-	allocbase;xbzero((void *)allocbase,x);allocbase+=roundpg(x);
+	allocbase;xmemset((void *)allocbase, 0,x);allocbase+=roundpg(x);
 #define nipqb	(&gvppqb->nc_pqb)
 #define gvp	gvppqb
 #define NI_WREG(csr, val) *(volatile long *)(niaddr + (csr)) = (val)
@@ -413,7 +413,7 @@ niopen(struct open_file *f, int adapt, i
 	msg->nm_len = 18;
 	msg->nm_opcode2 = NI_STPTDB;
 	ptdb = (struct ni_ptdb *)&msg->nm_text[0];
-	bzero(ptdb, sizeof(struct ni_ptdb));
+	memset(ptdb, 0, sizeof(struct ni_ptdb));
 	ptdb->np_index = 1;
 	ptdb->np_fque = 1;
 
@@ -426,7 +426,7 @@ niopen(struct open_file *f, int adapt, i
 #endif
 	msg = REMQHI(&fqb->nf_mforw);
 	ptdb = (struct ni_ptdb *)&msg->nm_text[0];
-	bzero(ptdb, sizeof(struct ni_ptdb));
+	memset(ptdb, 0, sizeof(struct ni_ptdb));
 	msg->nm_opcode = BVP_MSG;
 	msg->nm_len = 18;
 	ptdb->np_index = 2;
Index: sys/arch/vax/boot/boot/if_qe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/if_qe.c,v
retrieving revision 1.5
diff -u -p -r1.5 if_qe.c
--- sys/arch/vax/boot/boot/if_qe.c	4 Mar 2007 06:00:56 -0000	1.5
+++ sys/arch/vax/boot/boot/if_qe.c	19 Dec 2008 18:57:58 -0000
@@ -123,12 +123,12 @@ qe_init(u_char *eaddr)
 		eaddr[i] = QE_RCSR(i * 2);
 	}
 
-	bzero((void *)sc->rring, sizeof(struct qe_ring));
+	memset((void *)sc->rring, 0, sizeof(struct qe_ring));
 	sc->rring->qe_buf_len = -64;
 	sc->rring->qe_addr_lo = (short)((int)sc->setup_pkt);
 	sc->rring->qe_addr_hi = (short)((int)sc->setup_pkt >> 16);
 
-	bzero((void *)sc->tring, sizeof(struct qe_ring));
+	memset((void *)sc->tring, 0, sizeof(struct qe_ring));
 	sc->tring->qe_buf_len = -64;
 	sc->tring->qe_addr_lo = (short)((int)sc->setup_pkt);
 	sc->tring->qe_addr_hi = (short)((int)sc->setup_pkt >> 16);
Index: sys/arch/vax/boot/boot/if_ze.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/if_ze.c,v
retrieving revision 1.12
diff -u -p -r1.12 if_ze.c
--- sys/arch/vax/boot/boot/if_ze.c	27 May 2002 16:54:18 -0000	1.12
+++ sys/arch/vax/boot/boot/if_ze.c	19 Dec 2008 18:57:58 -0000
@@ -131,22 +131,22 @@ zeopen(struct open_file *f, int adapt, i
 	ze_rdes_list = OW_ALLOC((NRCV+1) * sizeof(struct ze_rdes));
 	ze_tdes_list = OW_ALLOC((NXMT+1) * sizeof(struct ze_tdes));
 	for (i=0; i < NRCV; i++) {
-		bzero(ze_rdes_list+i,sizeof(struct ze_rdes));
+		memset(ze_rdes_list+i, 0,sizeof(struct ze_rdes));
 		ze_rdes_list[i].ze_framelen = ZE_FRAMELEN_OW;
 		ze_rdes_list[i].ze_bufsize = ETHER_MAX_LEN;
 		ze_rdes_list[i].ze_bufaddr = alloc(ETHER_MAX_LEN);
 	}
-	bzero(ze_rdes_list+NRCV,sizeof(struct ze_rdes));
+	memset(ze_rdes_list+NRCV, 0,sizeof(struct ze_rdes));
 	ze_rdes_list[NRCV].ze_framelen = ZE_FRAMELEN_OW;
 	ze_rdes_list[NRCV].ze_rdes1 = ZE_RDES1_CA;
 	ze_rdes_list[NRCV].ze_bufaddr = (u_char *)ze_rdes_list;
 	for (i=0; i < NXMT; i++) {
-		bzero(ze_tdes_list+i,sizeof(struct ze_tdes));
+		memset(ze_tdes_list+i, 0,sizeof(struct ze_tdes));
 		ze_tdes_list[i].ze_tdes1 = ZE_TDES1_FS | ZE_TDES1_LS;
 		ze_tdes_list[i].ze_bufsize = ETHER_MAX_LEN;
 		ze_tdes_list[i].ze_bufaddr = alloc(ETHER_MAX_LEN);
 	}
-	bzero(ze_tdes_list+NXMT,sizeof(struct ze_tdes));
+	memset(ze_tdes_list+NXMT, 0,sizeof(struct ze_tdes));
 	ze_tdes_list[NXMT].ze_tdes1 = ZE_TDES1_CA;
 	ze_tdes_list[NXMT].ze_tdr = ZE_TDR_OW;
 	ze_tdes_list[NXMT].ze_bufaddr = (u_char *)ze_tdes_list;
@@ -154,12 +154,12 @@ zeopen(struct open_file *f, int adapt, i
 	/* Build setup frame. We set the SGEC to do a
 		perfect filter on our own address. */
 	ze_setup_tdes_list = OW_ALLOC(2*sizeof(struct ze_tdes));
-	bzero(ze_setup_tdes_list+0,2*sizeof(struct ze_tdes));
+	memset(ze_setup_tdes_list+0, 0,2*sizeof(struct ze_tdes));
 	ze_setup_tdes_list[0].ze_tdr = ZE_TDR_OW;
 	ze_setup_tdes_list[0].ze_tdes1 = ZE_TDES1_DT_SETUP;
 	ze_setup_tdes_list[0].ze_bufsize = SETUP_FRAME_LEN;
 	ze_setup_tdes_list[0].ze_bufaddr = alloc(SETUP_FRAME_LEN);
-	bzero(ze_setup_tdes_list[0].ze_bufaddr,SETUP_FRAME_LEN);
+	memset(ze_setup_tdes_list[0].ze_bufaddr, 0,SETUP_FRAME_LEN);
 	for (i=0; i < 16; i++)
 		bcopy(ze_myaddr,ze_setup_tdes_list[0].ze_bufaddr+(8*i),
 			ETHER_ADDR_LEN);
Index: sys/arch/vax/boot/boot/mfm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/mfm.c,v
retrieving revision 1.7
diff -u -p -r1.7 mfm.c
--- sys/arch/vax/boot/boot/mfm.c	8 Jun 2006 07:03:11 -0000	1.7
+++ sys/arch/vax/boot/boot/mfm.c	19 Dec 2008 18:57:58 -0000
@@ -370,7 +370,7 @@ mfmopen(f, adapt, ctlr, unit, part)
 	int err;
 	size_t i;
 
-	bzero(lp, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
 	msc->unit = unit;
 	msc->part = part;
 
@@ -479,7 +479,7 @@ mfm_rxstrategy(void *f, int func, daddr_
 	if (lp->d_secpercyl == 0)
 		lp->d_secpercyl = 30;
 
-	bzero((void *) 0x200D0000, size);
+	memset((void *) 0x200D0000, 0, size);
 	scount = size / 512;
 
 	while (scount) {
@@ -528,7 +528,7 @@ mfm_rxstrategy(void *f, int func, daddr_
 
 			mfm_rxprepare();
 			/* clear disk buffer */
-			bzero((void *) 0x200D0000, *rsize);
+			memset((void *) 0x200D0000, 0, *rsize);
 			res = mfm_command(DKC_CMD_READ_RX33);
 			/* copy to buf */
 			bcopy((void *) 0x200D0000, cbuf, *rsize);
@@ -567,7 +567,7 @@ mfm_rdstrategy(void *f, int func, daddr_
 
 	mfm_rdselect(msc->unit);
 
-	bzero((void *) 0x200D0000, size);
+	memset((void *) 0x200D0000, 0, size);
 	scount = size / 512;
 
 	while (scount) {
@@ -618,7 +618,7 @@ mfm_rdstrategy(void *f, int func, daddr_
 			creg.udc_term = UDC_TC_HDD;
 			cmd = DKC_CMD_READ_HDD;
 
-			bzero((void *) 0x200D0000, *rsize);
+			memset((void *) 0x200D0000, 0, *rsize);
 			res = mfm_command(cmd);
 			bcopy((void *) 0x200D0000, cbuf, *rsize);
 		}
Index: sys/arch/vax/boot/boot/netio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/netio.c,v
retrieving revision 1.10
diff -u -p -r1.10 netio.c
--- sys/arch/vax/boot/boot/netio.c	28 Apr 2008 20:23:39 -0000	1.10
+++ sys/arch/vax/boot/boot/netio.c	19 Dec 2008 18:57:58 -0000
@@ -115,7 +115,7 @@ net_devinit(struct open_file *f, struct 
 	/* find a free socket */
 	s = &desc;
 
-	bzero(s, sizeof(*s));
+	memset(s, 0, sizeof(*s));
 	best_if.nif_driver = drv;
 	s->io_netif = &best_if;
 	bcopy(eaddr, s->myea, 6);
Index: sys/arch/vax/boot/boot/ra.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/ra.c,v
retrieving revision 1.17
diff -u -p -r1.17 ra.c
--- sys/arch/vax/boot/boot/ra.c	1 Jul 2006 05:55:34 -0000	1.17
+++ sys/arch/vax/boot/boot/ra.c	19 Dec 2008 18:57:58 -0000
@@ -88,8 +88,8 @@ raopen(struct open_file *f, int adapt, i
 	    adapt, ctlr, unit, part);
 	printf("raopen: csrbase %x nexaddr %x\n", csrbase, nexaddr);
 #endif
-	bzero(&ralabel, sizeof(struct disklabel));
-	bzero((void *)&uda, sizeof(struct uda));
+	memset(&ralabel, 0, sizeof(struct disklabel));
+	memset((void *)&uda, 0, sizeof(struct uda));
 	if (bootrpb.devtyp == BDEV_TK)
 		is_tmscp = 1;
 	dunit = unit;
Index: sys/arch/vax/boot/boot/rom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/boot/rom.c,v
retrieving revision 1.7
diff -u -p -r1.7 rom.c
--- sys/arch/vax/boot/boot/rom.c	11 Dec 2005 12:19:30 -0000	1.7
+++ sys/arch/vax/boot/boot/rom.c	19 Dec 2008 18:57:58 -0000
@@ -68,7 +68,7 @@ romopen(struct open_file *f, int adapt, 
 
 	bqo = (void *)bootrpb.iovec;
 
-	bzero(lp, sizeof(struct disklabel));
+	memset(lp, 0, sizeof(struct disklabel));
 	dunit = unit;
 	dpart = part;
 
Index: sys/arch/vax/boot/xxboot/bootxx.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/boot/xxboot/bootxx.c,v
retrieving revision 1.28
diff -u -p -r1.28 bootxx.c
--- sys/arch/vax/boot/xxboot/bootxx.c	5 Mar 2007 20:53:34 -0000	1.28
+++ sys/arch/vax/boot/xxboot/bootxx.c	19 Dec 2008 18:57:58 -0000
@@ -114,7 +114,7 @@ Xmain()
 		bcopy ((void *)bootregs[11], rpb, sizeof(struct rpb));
 		bcopy ((void*)rpb->iovec, bqo, rpb->iovecsz);
 	} else {
-		bzero(rpb, sizeof(struct rpb));
+		memset(rpb, 0, sizeof(struct rpb));
 		rpb->devtyp = bootregs[0];
 		rpb->unit = bootregs[3];
 		rpb->rpb_bootr5 = bootregs[5];
@@ -208,7 +208,7 @@ tar_open(path, f)
 {
 	char *buf = alloc(512);
 
-	bzero(buf, 512);
+	memset(buf, 0, 512);
 	romstrategy(0, 0, 8192, 512, buf, 0);
 	if (bcmp(buf, "boot", 5) || bcmp(&buf[257], "ustar", 5))
 		return EINVAL; /* Not a ustarfs with "boot" first */
Index: sys/arch/vax/uba/qv.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/uba/qv.c,v
retrieving revision 1.20
diff -u -p -r1.20 qv.c
--- sys/arch/vax/uba/qv.c	11 Mar 2008 05:34:02 -0000	1.20
+++ sys/arch/vax/uba/qv.c	19 Dec 2008 18:57:59 -0000
@@ -750,7 +750,7 @@ struct qvdevice *qvaddr;
 	 * Clear the bit map
 	 */
 	for( i=0 , ptr = qp->bitmap ; i<240 ; i += 2 , ptr += 2048)
-		bzero( ptr, 2048 );
+		memset( ptr, 0, 2048 );
 	/*
 	 * Reinitialize the scanmap
 	 */
@@ -1193,7 +1193,7 @@ qvscroll()
 	 */
         scanline = qp->scanmap;
         b_row = qp->bitmap+(*scanline&0x3ff)*128;
-	bzero( b_row, 1920 );
+	memset( b_row, 0, 1920 );
 
 	/*
 	 * Now move the scanlines down 
Index: sys/arch/vax/vax/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/bus_dma.c,v
retrieving revision 1.32
diff -u -p -r1.32 bus_dma.c
--- sys/arch/vax/vax/bus_dma.c	4 Jun 2008 12:41:41 -0000	1.32
+++ sys/arch/vax/vax/bus_dma.c	19 Dec 2008 18:57:59 -0000
@@ -102,7 +102,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return (ENOMEM);
 
-	bzero(mapstore, mapsize);
+	memset(mapstore, 0, mapsize);
 	map = (struct vax_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
Index: sys/arch/vax/vax/db_disasm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/db_disasm.c,v
retrieving revision 1.18
diff -u -p -r1.18 db_disasm.c
--- sys/arch/vax/vax/db_disasm.c	11 Mar 2008 05:34:03 -0000	1.18
+++ sys/arch/vax/vax/db_disasm.c	19 Dec 2008 18:57:59 -0000
@@ -152,7 +152,7 @@ db_disasm(db_addr_t loc, bool altfmt)
 
 	inst_buffer	ib;
 
-	bzero(&ib, sizeof(ib));
+	memset(&ib, 0, sizeof(ib));
 	ib.ppc = (void *) loc;
 	ib.curp = ib.dasm;
 
Index: sys/arch/vax/vax/ka410.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/ka410.c,v
retrieving revision 1.31
diff -u -p -r1.31 ka410.c
--- sys/arch/vax/vax/ka410.c	11 Mar 2008 05:34:03 -0000	1.31
+++ sys/arch/vax/vax/ka410.c	19 Dec 2008 18:57:59 -0000
@@ -130,7 +130,7 @@ void
 ka41_cache_enable(void)
 {
 	*cacr = KA420_CACR_TPE; 	/* Clear any error, disable cache */
-	bzero(l2cache, KA420_CH2_SIZE); /* Clear whole cache */
+	memset(l2cache, 0, KA420_CH2_SIZE); /* Clear whole cache */
 	*cacr = KA420_CACR_CEN;		/* Enable cache */
 }
 
Index: sys/arch/vax/vax/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/pmap.c,v
retrieving revision 1.164
diff -u -p -r1.164 pmap.c
--- sys/arch/vax/vax/pmap.c	17 Dec 2008 20:51:32 -0000	1.164
+++ sys/arch/vax/vax/pmap.c	19 Dec 2008 18:57:59 -0000
@@ -472,7 +472,7 @@ pmap_steal_memory(vsize_t size, vaddr_t 
 	v = (vm_physmem[0].avail_start << PGSHIFT) | KERNBASE;
 	vm_physmem[0].avail_start += npgs;
 	vm_physmem[0].start += npgs;
-	bzero((void *)v, size);
+	memset((void *)v, 0, size);
 	return v;
 }
 
@@ -810,7 +810,7 @@ grow_p0(struct pmap *pm, int reqlen)
 
 	if (inuse)
 		bcopy(from, to, srclen);
-	bzero(to+srclen, dstlen-srclen);
+	memset(to+srclen, 0, dstlen-srclen);
 	p0br = (u_long)pm->pm_p0br;
 	pm->pm_p0br = (struct pte *)nptespc;
 	pm->pm_p0lr = (len/PPTESZ);
@@ -842,7 +842,7 @@ grow_p1(struct pmap *pm, int len)
 	 * Copy the old ptes to the new space.
 	 * Done by moving on system page table.
 	 */
-	bzero(kvtopte(nptespc), vax_btop(nlen-olen) * PPTESZ);
+	memset(kvtopte(nptespc), 0, vax_btop(nlen-olen) * PPTESZ);
 	if (optespc)
 		bcopy(kvtopte(optespc), kvtopte(nptespc+nlen-olen),
 		    vax_btop(olen) * PPTESZ);
@@ -1037,12 +1037,12 @@ pmap_kremove(vaddr_t va, vsize_t len)
 			continue;
 		if (pte->pg_sref == 0)
 			panic("pmap_kremove");
-		bzero(pte, LTOHPN * sizeof(struct pte));
+		memset(pte, 0, LTOHPN * sizeof(struct pte));
 		pte += LTOHPN;
 	}
 #else
 	len >>= VAX_PGSHIFT;
-	bzero(pte, len * sizeof(struct pte));
+	memset(pte, 0, len * sizeof(struct pte));
 #endif
 #if defined(MULTIPROCESSOR)
 	cpu_send_ipi(IPI_DEST_ALL, IPI_TBIA);
@@ -1337,7 +1337,7 @@ pmap_protect_long(pmap_t pmap, vaddr_t s
 					panic("pmap_remove PG_SREF page");
 #endif
 				RECURSESTART;
-				bzero(pts, sizeof(struct pte) * LTOHPN);
+				memset(pts, 0, sizeof(struct pte) * LTOHPN);
 				if (pt != Sysmap) {
 					if (ptpinuse(pts) == 0)
 						rmptep(pts);
@@ -1565,7 +1565,7 @@ pmap_page_protect_long(struct pv_entry *
 			if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
 				pv->pv_attr |= 
 				    g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
-			bzero(g, sizeof(struct pte) * LTOHPN);
+			memset(g, 0, sizeof(struct pte) * LTOHPN);
 			if (pv->pv_pmap != pmap_kernel()) {
 				if (ptpinuse(g) == 0)
 					rmptep((void *)g);
@@ -1587,7 +1587,7 @@ pmap_page_protect_long(struct pv_entry *
 			if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
 				pv->pv_attr |=
 				    g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
-			bzero(g, sizeof(struct pte) * LTOHPN);
+			memset(g, 0, sizeof(struct pte) * LTOHPN);
 			if (pl->pv_pmap != pmap_kernel()) {
 				if (ptpinuse(g) == 0)
 					rmptep((void *)g);
@@ -1796,7 +1796,7 @@ get_ptp(int w)
 
 	if ((a = ptpp)) {
 		ptpp = (int *)*ptpp;
-		bzero(a, VAX_NBPG);
+		memset(a, 0, VAX_NBPG);
 		return (vaddr_t)a;
 	}
 	a = (int *)getpage(w);
Index: sys/arch/vax/vsa/hdc9224.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vsa/hdc9224.c,v
retrieving revision 1.44
diff -u -p -r1.44 hdc9224.c
--- sys/arch/vax/vsa/hdc9224.c	15 Mar 2008 00:25:05 -0000	1.44
+++ sys/arch/vax/vsa/hdc9224.c	19 Dec 2008 18:58:00 -0000
@@ -540,7 +540,7 @@ hdcstart(struct hdcsoftc *sc, struct buf
 
 	cn++; /* first cylinder is reserved */
 
-	bzero(p, sizeof(struct hdc9224_UDCreg));
+	memset(p, 0, sizeof(struct hdc9224_UDCreg));
 
 	/*
 	 * Tricky thing: the controller do itself only increase the sector
Index: sys/arch/vax/vsa/smg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vsa/smg.c,v
retrieving revision 1.49
diff -u -p -r1.49 smg.c
--- sys/arch/vax/vsa/smg.c	19 Dec 2008 18:49:38 -0000	1.49
+++ sys/arch/vax/vsa/smg.c	19 Dec 2008 18:58:00 -0000
@@ -347,12 +347,12 @@ smg_erasecols(void *id, int row, int sta
 	struct smg_screen * const ss = id;
 	int i;
 
-	bzero(&ss->ss_image[row][startcol], ncols);
-	bzero(&ss->ss_attr[row][startcol], ncols);
+	memset(&ss->ss_image[row][startcol], 0, ncols);
+	memset(&ss->ss_attr[row][startcol], 0, ncols);
 	if (ss != curscr)
 		return;
 	for (i = 0; i < SM_CHEIGHT; i++)
-		bzero(&SM_ADDR(row, startcol, i), ncols);
+		memset(&SM_ADDR(row, startcol, i), 0, ncols);
 }
 
 static void
@@ -395,17 +395,17 @@ smg_eraserows(void *id, int startrow, in
 	struct smg_screen * const ss = id;
 	int frows;
 
-	bzero(&ss->ss_image[startrow][0], nrows * SM_COLS);
-	bzero(&ss->ss_attr[startrow][0], nrows * SM_COLS);
+	memset(&ss->ss_image[startrow][0], 0, nrows * SM_COLS);
+	memset(&ss->ss_attr[startrow][0], 0, nrows * SM_COLS);
 	if (ss != curscr)
 		return;
 	if (nrows > 25) {
 		frows = nrows >> 1;
-		bzero(&sm_addr[(startrow * SM_NEXTROW)], frows * SM_NEXTROW);
+		memset(&sm_addr[(startrow * SM_NEXTROW)], 0, frows * SM_NEXTROW);
 		bzero(&sm_addr[((startrow + frows) * SM_NEXTROW)],
 		    (nrows - frows) * SM_NEXTROW);
 	} else
-		bzero(&sm_addr[(startrow * SM_NEXTROW)], nrows * SM_NEXTROW);
+		memset(&sm_addr[(startrow * SM_NEXTROW)], 0, nrows * SM_NEXTROW);
 }
 
 static int
Index: sys/arch/x68k/stand/aout2hux/aout2hux.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/aout2hux/aout2hux.c,v
retrieving revision 1.5
diff -u -p -r1.5 aout2hux.c
--- sys/arch/x68k/stand/aout2hux/aout2hux.c	19 Nov 1999 03:54:08 -0000	1.5
+++ sys/arch/x68k/stand/aout2hux/aout2hux.c	19 Dec 2008 18:58:00 -0000
@@ -635,7 +635,7 @@ aout2hux(fn1, fn2, loadadr1, loadadr2, f
 	/*
 	 * prepare for .x header
 	 */
-	bzero((void *) &xhdr, sizeof xhdr);
+	memset((void *) &xhdr, 0, sizeof xhdr);
 	put_uint16(&xhdr.x_magic, HUXMAGIC);
 	put_uint32(&xhdr.x_entry, execoff);
 	put_uint32(&xhdr.x_text, textsize + paddingsize);
Index: sys/compat/darwin/darwin_attr.c
===================================================================
RCS file: /cvsroot/src/sys/compat/darwin/darwin_attr.c,v
retrieving revision 1.24
diff -u -p -r1.24 darwin_attr.c
--- sys/compat/darwin/darwin_attr.c	28 Apr 2008 20:23:41 -0000	1.24
+++ sys/compat/darwin/darwin_attr.c	19 Dec 2008 18:58:00 -0000
@@ -275,7 +275,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 
 		/* XXX no way I can do that one */
 
-		(void)bzero(&ts, sizeof(ts));
+		(void)memset(&ts, 0, sizeof(ts));
 		if (ATTR_APPEND(ts, bp, len) != 0)
 			goto out3;
 	}
@@ -283,7 +283,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 	if (kalist.commonattr & DARWIN_ATTR_CMN_FNDRINFO) { /* XXX */
 		char data[32];
 
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -500,7 +500,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 		/*
 		 * XXX bitmap of encoding used in this volume
 		 */
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -508,7 +508,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 	if (kalist.volattr & DARWIN_ATTR_VOL_CAPABILITIES) { /* XXX */
 		darwin_vol_capabilities_attr_t data;
 
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -516,7 +516,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 	if (kalist.volattr & DARWIN_ATTR_VOL_ATTRIBUTES) { /* XXX */
 		darwin_vol_attributes_attr_t data;
 
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -532,7 +532,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 	if (kalist.dirattr & DARWIN_ATTR_DIR_ENTRYCOUNT) { /* XXX */
 		unsigned long data;
 
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -540,7 +540,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 	if (kalist.dirattr & DARWIN_ATTR_DIR_MOUNTSTATUS) { /* XXX */
 		unsigned long data;
 
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -597,7 +597,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 		unsigned long data;
 
 		/* Reserved, returns 0 */
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -636,7 +636,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 		darwin_extentrecord data;
 
 		/* Obsolete in Darwin */
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
@@ -661,7 +661,7 @@ darwin_sys_getattrlist(struct lwp *l, co
 		darwin_extentrecord data;
 
 		/* Obsolete in Darwin */
-		(void)bzero(&data, sizeof(data));
+		(void)memset(&data, 0, sizeof(data));
 		if (ATTR_APPEND(data, bp, len) != 0)
 			goto out3;
 	}
Index: sys/compat/darwin/darwin_mman.c
===================================================================
RCS file: /cvsroot/src/sys/compat/darwin/darwin_mman.c,v
retrieving revision 1.29
diff -u -p -r1.29 darwin_mman.c
--- sys/compat/darwin/darwin_mman.c	28 Apr 2008 20:23:41 -0000	1.29
+++ sys/compat/darwin/darwin_mman.c	19 Dec 2008 18:58:00 -0000
@@ -192,7 +192,7 @@ darwin_sys_load_shared_file(struct lwp *
 
 	/* Do the actual mapping */
 	for (i = 0; i < SCARG(uap, count); i++) {
-		bzero(&evc, sizeof(evc));
+		memset(&evc, 0, sizeof(evc));
 		evc.ev_addr = base + mapp[i].mapping_offset;
 		evc.ev_len = mapp[i].size;
 		evc.ev_prot = mapp[i].protection & VM_PROT_ALL;
Index: sys/compat/darwin/darwin_route.c
===================================================================
RCS file: /cvsroot/src/sys/compat/darwin/darwin_route.c,v
retrieving revision 1.14
diff -u -p -r1.14 darwin_route.c
--- sys/compat/darwin/darwin_route.c	28 Apr 2008 20:23:41 -0000	1.14
+++ sys/compat/darwin/darwin_route.c	19 Dec 2008 18:58:00 -0000
@@ -154,7 +154,7 @@ darwin_ifaddrs(int af, char *dst, size_t
 					continue;
 			}
 
-			bzero(&diam, sizeof(diam));
+			memset(&diam, 0, sizeof(diam));
 
 			diam.diam_len = sizeof(diam);
 			diam.diam_vers = DARWIN_RTM_VERSION;
Index: sys/compat/irix/irix_mount.c
===================================================================
RCS file: /cvsroot/src/sys/compat/irix/irix_mount.c,v
retrieving revision 1.22
diff -u -p -r1.22 irix_mount.c
--- sys/compat/irix/irix_mount.c	28 Apr 2008 20:23:41 -0000	1.22
+++ sys/compat/irix/irix_mount.c	19 Dec 2008 18:58:00 -0000
@@ -85,7 +85,7 @@ irix_sys_getmountid(struct lwp *l, const
 	 * as the unique ID for the filesystem
 	 */
 	addr = (void *)&vp->v_mount;
-	bzero((void *)&mountid, sizeof(mountid));
+	memset((void *)&mountid, 0, sizeof(mountid));
 	(void)memcpy((void *)&mountid, &addr, sizeof(addr));
 	error = copyout(&mountid, SCARG(uap, buf), sizeof(mountid));
 
Index: sys/compat/irix/irix_prctl.c
===================================================================
RCS file: /cvsroot/src/sys/compat/irix/irix_prctl.c,v
retrieving revision 1.48
diff -u -p -r1.48 irix_prctl.c
--- sys/compat/irix/irix_prctl.c	2 Jul 2008 19:49:58 -0000	1.48
+++ sys/compat/irix/irix_prctl.c	19 Dec 2008 18:58:00 -0000
@@ -315,7 +315,7 @@ irix_sproc(void *entry, unsigned int inh
 		}
 
 		/* Now map the new stack */
-		bzero(&vmc, sizeof(vmc));
+		memset(&vmc, 0, sizeof(vmc));
 		vmc.ev_addr = trunc_page((u_long)sp);
 		vmc.ev_len = round_page(len);
 		vmc.ev_prot = UVM_PROT_RWX;
@@ -627,7 +627,7 @@ irix_prda_init(struct proc *p)
 	struct irix_prda_sys ips;
 	struct lwp *l;
 
-	bzero(&evc, sizeof(evc));
+	memset(&evc, 0, sizeof(evc));
 	evc.ev_addr = (u_long)IRIX_PRDA;
 	evc.ev_len = sizeof(struct irix_prda);
 	evc.ev_prot = UVM_PROT_RW;
@@ -641,7 +641,7 @@ irix_prda_init(struct proc *p)
 		return error;
 
 	ip = (struct irix_prda *)IRIX_PRDA;
-	bzero(&ips, sizeof(ips));
+	memset(&ips, 0, sizeof(ips));
 
 	ips.t_pid = p->p_pid;
 	/*
Index: sys/compat/irix/irix_signal.c
===================================================================
RCS file: /cvsroot/src/sys/compat/irix/irix_signal.c,v
retrieving revision 1.48
diff -u -p -r1.48 irix_signal.c
--- sys/compat/irix/irix_signal.c	28 Apr 2008 20:23:42 -0000	1.48
+++ sys/compat/irix/irix_signal.c	19 Dec 2008 18:58:00 -0000
@@ -284,7 +284,7 @@ irix_sendsig(const ksiginfo_t *ksi, cons
 	/*
 	 * Build the signal frame
 	 */
-	bzero(&sf, sizeof(sf));
+	memset(&sf, 0, sizeof(sf));
 	if (SIGACTION(p, ksi->ksi_signo).sa_flags & SA_SIGINFO) {
 		irix_set_ucontext(&sf.isf_ctx.iss.iuc, mask, ksi->ksi_trap, l);
 		irix_signal_siginfo(&sf.isf_ctx.iss.iis, ksi->ksi_signo,
Index: sys/compat/linux/arch/amd64/linux_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/amd64/linux_machdep.c,v
retrieving revision 1.34
diff -u -p -r1.34 linux_machdep.c
--- sys/compat/linux/arch/amd64/linux_machdep.c	26 Oct 2008 20:25:49 -0000	1.34
+++ sys/compat/linux/arch/amd64/linux_machdep.c	19 Dec 2008 18:58:00 -0000
@@ -174,7 +174,7 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	    ((((long)sp - sizeof(struct linux_rt_sigframe)) & ~0xfUL) - 8);
 	sfp = (struct linux_rt_sigframe *)sp;
 
-	bzero(&sigframe, sizeof(sigframe));
+	memset(&sigframe, 0, sizeof(sigframe));
 	if (ps->sa_sigdesc[sig].sd_vers != 0)
 		sigframe.pretcode = 
 		    (char *)(u_long)ps->sa_sigdesc[sig].sd_tramp;
@@ -284,7 +284,7 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	 */
 	if (fpsp != NULL) {
 		(void)process_read_fpregs(l, &fpregs);
-		bzero(&fpstate, sizeof(fpstate));
+		memset(&fpstate, 0, sizeof(fpstate));
 		fpstate.cwd = fpregs.fp_fcw;
 		fpstate.swd = fpregs.fp_fsw;
 		fpstate.twd = fpregs.fp_ftw;
@@ -396,7 +396,7 @@ linux_sys_rt_sigreturn(struct lwp *l, co
 	luctx = &frame.uc;
 	lsigctx = &luctx->luc_mcontext;
 
-	bzero(&uctx, sizeof(uctx));
+	memset(&uctx, 0, sizeof(uctx));
 	mctx = (mcontext_t *)&uctx.uc_mcontext;
 	fxarea = (struct fxsave64 *)&mctx->__fpregs;
 
Index: sys/compat/linux/arch/m68k/linux_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/m68k/linux_machdep.c,v
retrieving revision 1.38
diff -u -p -r1.38 linux_machdep.c
--- sys/compat/linux/arch/m68k/linux_machdep.c	28 Apr 2008 20:23:42 -0000	1.38
+++ sys/compat/linux/arch/m68k/linux_machdep.c	19 Dec 2008 18:58:00 -0000
@@ -140,7 +140,7 @@ setup_linux_sigframe(struct frame *frame
 	kf.sf_c.c_sc.sc_a1 = frame->f_regs[A1];
 
 	/* Clear for security (and initialize ss_format). */
-	bzero(&kf.sf_c.c_sc.sc_ss, sizeof kf.sf_c.c_sc.sc_ss);
+	memset(&kf.sf_c.c_sc.sc_ss, 0, sizeof kf.sf_c.c_sc.sc_ss);
 
 	if (ft >= FMT4) {
 #ifdef DEBUG
@@ -291,7 +291,7 @@ setup_linux_rt_sigframe(struct frame *fr
 	kf.sf_sigtramp[1] = LINUX_RT_SF_SIGTRAMP1;
 
 	/* clear for security (and initialize uc_flags, ss_format, etc.). */
-	bzero(&kf.sf_uc, sizeof(struct linux_ucontext));
+	memset(&kf.sf_uc, 0, sizeof(struct linux_ucontext));
 
 	/*
 	 * Save necessary hardware state.  Currently this includes:
@@ -389,7 +389,7 @@ setup_linux_rt_sigframe(struct frame *fr
 	 * XXX Or we do the emuldata thing.
 	 * XXX -erh
 	 */
-	bzero(&kf.sf_info, sizeof(struct linux_siginfo));
+	memset(&kf.sf_info, 0, sizeof(struct linux_siginfo));
 	kf.sf_info.lsi_signo = sig;
 	kf.sf_info.lsi_code = LINUX_SI_USER;
 	kf.sf_info.lsi_pid = p->p_pid;
Index: sys/compat/linux32/common/linux32_signal.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux32/common/linux32_signal.c,v
retrieving revision 1.9
diff -u -p -r1.9 linux32_signal.c
--- sys/compat/linux32/common/linux32_signal.c	24 Jul 2008 12:09:56 -0000	1.9
+++ sys/compat/linux32/common/linux32_signal.c	19 Dec 2008 18:58:00 -0000
@@ -181,7 +181,7 @@ linux32_old_to_native_sigset(sigset_t *b
 {
 	linux32_sigset_t ls;
 
-	bzero(&ls, sizeof(ls));
+	memset(&ls, 0, sizeof(ls));
 	ls.sig[0] = *lss;
 	
 	linux32_to_native_sigset(bss, &ls);
Index: sys/compat/linux32/common/linux32_stat.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux32/common/linux32_stat.c,v
retrieving revision 1.12
diff -u -p -r1.12 linux32_stat.c
--- sys/compat/linux32/common/linux32_stat.c	19 Nov 2008 18:36:04 -0000	1.12
+++ sys/compat/linux32/common/linux32_stat.c	19 Dec 2008 18:58:00 -0000
@@ -80,7 +80,7 @@ static inline void linux32_from_stat(str
 static inline void
 linux32_from_stat(struct stat *st, struct linux32_stat64 *st32)
 {
-	bzero(st32, sizeof(*st32));
+	memset(st32, 0, sizeof(*st32));
 	st32->lst_dev = linux_fakedev(st->st_dev, 0);
 	st32->__lst_ino = st->st_ino;
 	st32->lst_mode = st->st_mode;
Index: sys/compat/mach/mach_message.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_message.c,v
retrieving revision 1.57
diff -u -p -r1.57 mach_message.c
--- sys/compat/mach/mach_message.c	2 Jul 2008 19:49:58 -0000	1.57
+++ sys/compat/mach/mach_message.c	19 Dec 2008 18:58:01 -0000
@@ -1115,7 +1115,7 @@ mach_message_get(mach_msg_header_t *msgh
 	struct mach_message *mm;
 
 	mm = (struct mach_message *)pool_get(&mach_message_pool, PR_WAITOK);
-	bzero(mm, sizeof(*mm));
+	memset(mm, 0, sizeof(*mm));
 	mm->mm_msg = msgh;
 	mm->mm_size = size;
 	mm->mm_port = mp;
Index: sys/compat/mach/mach_port.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_port.c,v
retrieving revision 1.65
diff -u -p -r1.65 mach_port.c
--- sys/compat/mach/mach_port.c	28 Apr 2008 20:23:44 -0000	1.65
+++ sys/compat/mach/mach_port.c	19 Dec 2008 18:58:01 -0000
@@ -649,7 +649,7 @@ mach_port_get(void)
 	struct mach_port *mp;
 
 	mp = (struct mach_port *)pool_get(&mach_port_pool, PR_WAITOK);
-	bzero(mp, sizeof(*mp));
+	memset(mp, 0, sizeof(*mp));
 	mp->mp_recv = NULL;
 	mp->mp_count = 0;
 	mp->mp_flags = 0;
Index: sys/compat/mach/mach_vm.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_vm.c,v
retrieving revision 1.60
diff -u -p -r1.60 mach_vm.c
--- sys/compat/mach/mach_vm.c	28 Apr 2008 20:23:45 -0000	1.60
+++ sys/compat/mach/mach_vm.c	19 Dec 2008 18:58:01 -0000
@@ -269,7 +269,7 @@ mach_vm_wire(struct mach_trap_args *args
 	    (void *)req->req_address, req->req_size, req->req_access);
 #endif
 
-	bzero(&rep, sizeof(*rep));
+	memset(&rep, 0, sizeof(*rep));
 
 	if ((req->req_access & ~VM_PROT_ALL) != 0)
 		return mach_msg_error(args, EINVAL);
@@ -373,7 +373,7 @@ mach_sys_map_fd(struct lwp *l, const str
 	printf("vm_map_fd: addr = %p len = 0x%08lx\n",
 	    va, (long)SCARG(uap, size));
 #endif
-	bzero(&evc, sizeof(evc));
+	memset(&evc, 0, sizeof(evc));
 	evc.ev_addr = (u_long)va;
 	evc.ev_len = SCARG(uap, size);
 	evc.ev_prot = VM_PROT_ALL;
@@ -404,7 +404,7 @@ mach_sys_map_fd(struct lwp *l, const str
 
 		va = (void *)evc.ev_addr;
 
-		bzero(&evc, sizeof(evc));
+		memset(&evc, 0, sizeof(evc));
 		evc.ev_addr = (u_long)va;
 		evc.ev_len = SCARG(uap, size);
 		evc.ev_prot = VM_PROT_ALL;
Index: sys/compat/ndis/subr_ndis.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ndis/subr_ndis.c,v
retrieving revision 1.14
diff -u -p -r1.14 subr_ndis.c
--- sys/compat/ndis/subr_ndis.c	13 Nov 2008 12:09:52 -0000	1.14
+++ sys/compat/ndis/subr_ndis.c	19 Dec 2008 18:58:01 -0000
@@ -505,7 +505,7 @@ NdisMRegisterMiniport(handle, characteri
 		return(NDIS_STATUS_RESOURCES);
    pch = (ndis_miniport_characteristics *)ch;
 
-	bzero((char *)pch, sizeof(ndis_miniport_characteristics));
+	memset((char *)pch, 0, sizeof(ndis_miniport_characteristics));
 
 #ifdef __FreeBSD__
 	bcopy((char *)characteristics, (char *)pch, len);
@@ -805,7 +805,7 @@ NdisReadConfiguration(status, parm, cfg,
 
 	ndis_unicode_to_ascii(key->us_buf, key->us_len, &keystr);
 	*parm = &block->nmb_replyparm;
-	bzero((char *)&block->nmb_replyparm, sizeof(ndis_config_parm));
+	memset((char *)&block->nmb_replyparm, 0, sizeof(ndis_config_parm));
 	unicode = (uint16_t *)&block->nmb_dummybuf;
 	
 #ifdef __NetBSD__	
@@ -968,7 +968,7 @@ NdisWriteConfiguration(
 	ndis_unicode_to_ascii(key->us_buf, key->us_len, &keystr);
 
 	/* Decode the parameter into a string. */
-	bzero(val, sizeof(val));
+	memset(val, 0, sizeof(val));
 	*status = ndis_decode_parm(block, parm, val);
 	if (*status != NDIS_STATUS_SUCCESS) {
 		free(keystr, M_DEVBUF);
@@ -3203,7 +3203,7 @@ ndis_find_sym(lf, filename, suffix, sym)
 	if (fullsym == NULL)
 		return(ENOMEM);
 
-	bzero(fullsym, MAXPATHLEN);
+	memset(fullsym, 0, MAXPATHLEN);
 	strncpy(fullsym, filename, MAXPATHLEN);
 	if (strlen(filename) < 4) {
 		ExFreePool(fullsym);
Index: sys/compat/ndis/subr_ntoskrnl.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ndis/subr_ntoskrnl.c,v
retrieving revision 1.13
diff -u -p -r1.13 subr_ntoskrnl.c
--- sys/compat/ndis/subr_ntoskrnl.c	13 Nov 2008 12:09:52 -0000	1.13
+++ sys/compat/ndis/subr_ntoskrnl.c	19 Dec 2008 18:58:02 -0000
@@ -506,7 +506,7 @@ IoCreateDevice(
 			return(STATUS_INSUFFICIENT_RESOURCES);
 		}
 
-		bzero(dev->do_devext, devextlen);
+		memset(dev->do_devext, 0, devextlen);
 	} else
 		dev->do_devext = NULL;
 
@@ -757,7 +757,7 @@ IoBuildDeviceIoControlRequest(iocode, do
 			bzero((char *)ip->irp_assoc.irp_sysbuf + ilen,
 			    buflen - ilen);
 		} else
-			bzero(ip->irp_assoc.irp_sysbuf, ilen);
+			memset(ip->irp_assoc.irp_sysbuf, 0, ilen);
 		ip->irp_userbuf = obuf;
 		break;
 	case METHOD_IN_DIRECT:
@@ -861,7 +861,7 @@ IoInitializeIrp(io, psize, ssize)
 	uint16_t		psize;
 	uint8_t			ssize;
 {
-	bzero((char *)io, IoSizeOfIrp(ssize));
+	memset((char *)io, 0, IoSizeOfIrp(ssize));
 	io->irp_size = psize;
 	io->irp_stackcnt = ssize;
 	io->irp_currentstackloc = ssize;
@@ -1761,7 +1761,7 @@ ExInitializePagedLookasideList(
 	uint32_t		tag,
 	uint16_t		depth)
 {
-	bzero((char *)lookaside, sizeof(paged_lookaside_list));
+	memset((char *)lookaside, 0, sizeof(paged_lookaside_list));
 
 	if (size < sizeof(slist_entry))
 		lookaside->nll_l.gl_size = sizeof(slist_entry);
@@ -1815,7 +1815,7 @@ ExInitializeNPagedLookasideList(
 	uint32_t		tag,
 	uint16_t		depth)
 {
-	bzero((char *)lookaside, sizeof(npaged_lookaside_list));
+	memset((char *)lookaside, 0, sizeof(npaged_lookaside_list));
 
 	if (size < sizeof(slist_entry))
 		lookaside->nll_l.gl_size = sizeof(slist_entry);
@@ -2276,7 +2276,7 @@ RtlUnicodeStringToInteger(ustr, base, va
 
 	uchr = ustr->us_buf;
 	len = ustr->us_len;
-	bzero(abuf, sizeof(abuf));
+	memset(abuf, 0, sizeof(abuf));
 
 	if ((char)((*uchr) & 0xFF) == '-') {
 		neg = 1;
Index: sys/dev/vnd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/vnd.c,v
retrieving revision 1.189
diff -u -p -r1.189 vnd.c
--- sys/dev/vnd.c	19 Nov 2008 18:38:36 -0000	1.189
+++ sys/dev/vnd.c	19 Dec 2008 18:58:02 -0000
@@ -1125,7 +1125,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
 			vnd->sc_comp_buffblk = -1;
  
 			/* Initialize decompress stream */
-			bzero(&vnd->sc_comp_stream, sizeof(z_stream));
+			memset(&vnd->sc_comp_stream, 0, sizeof(z_stream));
 			vnd->sc_comp_stream.zalloc = vnd_alloc;
 			vnd->sc_comp_stream.zfree = vnd_free;
 			error = inflateInit2(&vnd->sc_comp_stream, MAX_WBITS);
Index: sys/dev/cardbus/rbus_ppb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/cardbus/rbus_ppb.c,v
retrieving revision 1.26
diff -u -p -r1.26 rbus_ppb.c
--- sys/dev/cardbus/rbus_ppb.c	21 Jul 2008 09:51:46 -0000	1.26
+++ sys/dev/cardbus/rbus_ppb.c	19 Dec 2008 18:58:02 -0000
@@ -262,8 +262,8 @@ rbus_pci_addr_fixup(struct ppb_cardbus_s
 	rct.iobustags = alloca(maxbus * sizeof(rbus_tag_t));
 	rct.membustags = alloca(maxbus * sizeof(rbus_tag_t));
 
-	bzero(rct.bussize_ioreqs, size);
-	bzero(rct.bussize_memreqs, size);
+	memset(rct.bussize_ioreqs, 0, size);
+	memset(rct.bussize_memreqs, 0, size);
 
 	printf("%s: sizing buses %d-%d\n",
 	       device_xname(rct.csc->sc_dev),
Index: sys/dev/drm/drm_context.c
===================================================================
RCS file: /cvsroot/src/sys/dev/drm/drm_context.c,v
retrieving revision 1.3
diff -u -p -r1.3 drm_context.c
--- sys/dev/drm/drm_context.c	11 Dec 2007 11:17:31 -0000	1.3
+++ sys/dev/drm/drm_context.c	19 Dec 2008 18:58:02 -0000
@@ -242,7 +242,7 @@ int drm_resctx(DRM_IOCTL_ARGS)
 	DRM_COPY_FROM_USER_IOCTL( res, (drm_ctx_res_t *)data, sizeof(res) );
 
 	if ( res.count >= DRM_RESERVED_CONTEXTS ) {
-		bzero(&ctx, sizeof(ctx));
+		memset(&ctx, 0, sizeof(ctx));
 		for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
 			ctx.handle = i;
 			if ( DRM_COPY_TO_USER( &res.contexts[i],
Index: sys/dev/eisa/ahb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/eisa/ahb.c,v
retrieving revision 1.51
diff -u -p -r1.51 ahb.c
--- sys/dev/eisa/ahb.c	28 Apr 2008 20:23:48 -0000	1.51
+++ sys/dev/eisa/ahb.c	19 Dec 2008 18:58:02 -0000
@@ -471,7 +471,7 @@ ahb_create_ecbs(struct ahb_softc *sc, st
 	struct ahb_ecb *ecb;
 	int i, error;
 
-	bzero(ecbstore, sizeof(struct ahb_ecb) * count);
+	memset(ecbstore, 0, sizeof(struct ahb_ecb) * count);
 	for (i = 0; i < count; i++) {
 		ecb = &ecbstore[i];
 		if ((error = ahb_init_ecb(sc, ecb)) != 0) {
Index: sys/dev/gpio/gpioow.c
===================================================================
RCS file: /cvsroot/src/sys/dev/gpio/gpioow.c,v
retrieving revision 1.5
diff -u -p -r1.5 gpioow.c
--- sys/dev/gpio/gpioow.c	4 May 2008 14:01:14 -0000	1.5
+++ sys/dev/gpio/gpioow.c	19 Dec 2008 18:58:02 -0000
@@ -135,7 +135,7 @@ gpioow_attach(device_t parent, device_t 
 	sc->sc_ow_bus.bus_reset = gpioow_ow_reset;
 	sc->sc_ow_bus.bus_bit = gpioow_ow_bit;
 
-	bzero(&oba, sizeof(oba));
+	memset(&oba, 0, sizeof(oba));
 	oba.oba_bus = &sc->sc_ow_bus;
 	sc->sc_ow_dev = config_found(self, &oba, onewirebus_print);
 
Index: sys/dev/ic/aic79xx.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/aic79xx.c,v
retrieving revision 1.38
diff -u -p -r1.38 aic79xx.c
--- sys/dev/ic/aic79xx.c	21 Mar 2008 08:17:30 -0000	1.38
+++ sys/dev/ic/aic79xx.c	19 Dec 2008 18:58:04 -0000
@@ -5799,7 +5799,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
 		if (sg_map == NULL)
 			return (0);
 
-		bzero(sg_map, sizeof(*sg_map));
+		memset(sg_map, 0, sizeof(*sg_map));
 
 		/* Allocate the next batch of S/G lists */
 		if (ahd_createdmamem(ahd->parent_dmat, ahd_sglist_allocsize(ahd), ahd->sc_dmaflags,
@@ -5839,7 +5839,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
 		if (sense_map == NULL)
 			return (0);
 
-		bzero(sense_map, sizeof(*sense_map));
+		memset(sense_map, 0, sizeof(*sense_map));
 
 		/* Allocate the next batch of sense buffers */
 		if (ahd_createdmamem(ahd->parent_dmat, PAGE_SIZE, ahd->sc_dmaflags,
Index: sys/dev/ic/cac.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/cac.c,v
retrieving revision 1.47
diff -u -p -r1.47 cac.c
--- sys/dev/ic/cac.c	8 Jun 2008 12:43:51 -0000	1.47
+++ sys/dev/ic/cac.c	19 Dec 2008 18:58:04 -0000
@@ -721,7 +721,7 @@ cac_sensor_refresh(struct sysmon_envsys 
 	if (edata->sensor >= sc->sc_nunits)
 		return;
 
-	bzero(&bv, sizeof(bv));
+	memset(&bv, 0, sizeof(bv));
 	bv.bv_volid = edata->sensor;
 	s = splbio();
 	if (cac_ioctl_vol(sc, &bv)) {
Index: sys/dev/ic/ciss.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/ciss.c,v
retrieving revision 1.14
diff -u -p -r1.14 ciss.c
--- sys/dev/ic/ciss.c	4 Sep 2008 19:03:14 -0000	1.14
+++ sys/dev/ic/ciss.c	19 Dec 2008 18:58:05 -0000
@@ -231,7 +231,7 @@ ciss_attach(struct ciss_softc *sc)
 		printf(": cannot map CCBs (%d)\n", error);
 		return -1;
 	}
-	bzero(sc->ccbs, total);
+	memset(sc->ccbs, 0, total);
 
 	if ((error = bus_dmamap_create(sc->sc_dmat, total, 1,
 	    total, 0, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &sc->cmdmap))) {
@@ -299,7 +299,7 @@ ciss_attach(struct ciss_softc *sc)
 		printf(": cannot map scratch buffer (%d)\n", error);
 		return -1;
 	}
-	bzero(sc->scratch, PAGE_SIZE);
+	memset(sc->scratch, 0, PAGE_SIZE);
 	sc->sc_waitflag = XS_CTL_NOSLEEP;		/* can't sleep yet */
 
 	mutex_enter(&sc->sc_mutex_scratch);		/* is this really needed? */
@@ -348,7 +348,7 @@ ciss_attach(struct ciss_softc *sc)
 		bus_dmamap_destroy(sc->sc_dmat, sc->cmdmap);
 		return -1;
 	}
-	bzero(sc->sc_lds, sc->maxunits * sizeof(*sc->sc_lds));
+	memset(sc->sc_lds, 0, sc->maxunits * sizeof(*sc->sc_lds));
 
 	sc->sc_flush = CISS_FLUSH_ENABLE;
 	if (!(sc->sc_sh = shutdownhook_establish(ciss_shutdown, sc))) {
@@ -491,7 +491,7 @@ ciss_cmd(struct ciss_ccb *ccb, int flags
 	} else
 		cmd->sgin = 0;
 	cmd->sglen = htole16((u_int16_t)cmd->sgin);
-	bzero(&ccb->ccb_err, sizeof(ccb->ccb_err));
+	memset(&ccb->ccb_err, 0, sizeof(ccb->ccb_err));
 
 	bus_dmamap_sync(sc->sc_dmat, sc->cmdmap, 0, sc->cmdmap->dm_mapsize,
 	    BUS_DMASYNC_PREWRITE);
@@ -639,7 +639,7 @@ ciss_error(struct ciss_ccb *ccb)
 		    device_xname(&sc->sc_dev), ccb->ccb_cmd.id,
 		    err->err_info, err->err_type[3], err->err_type[2]);
 		if (xs) {
-			bzero(&xs->sense, sizeof(xs->sense));
+			memset(&xs->sense, 0, sizeof(xs->sense));
 			xs->sense.scsi_sense.response_code =
 				SSD_RCODE_CURRENT | SSD_RCODE_VALID;
 			xs->sense.scsi_sense.flags = SKEY_ILLEGAL_REQUEST;
@@ -709,7 +709,7 @@ ciss_inq(struct ciss_softc *sc, struct c
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_IN;
 	cmd->tmo = htole16(0);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_GET;
 	cmd->cdb[6] = CISS_CMS_CTRL_CTRL;
 	cmd->cdb[7] = sizeof(*inq) >> 8;	/* biiiig endian */
@@ -741,7 +741,7 @@ ciss_ldmap(struct ciss_softc *sc)
 	cmd->cdblen = 12;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_IN;
 	cmd->tmo = htole16(30);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_LDMAP;
 	cmd->cdb[8] = total >> 8;	/* biiiig endian */
 	cmd->cdb[9] = total & 0xff;
@@ -770,7 +770,7 @@ ciss_sync(struct ciss_softc *sc)
 
 	mutex_enter(&sc->sc_mutex_scratch);
 	flush = sc->scratch;
-	bzero(flush, sizeof(*flush));
+	memset(flush, 0, sizeof(*flush));
 	flush->flush = sc->sc_flush;
 
 	ccb = ciss_get_ccb(sc);
@@ -783,7 +783,7 @@ ciss_sync(struct ciss_softc *sc)
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_OUT;
 	cmd->tmo = 0;
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_SET;
 	cmd->cdb[6] = CISS_CMS_CTRL_FLUSH;
 	cmd->cdb[7] = sizeof(*flush) >> 8;	/* biiiig endian */
@@ -813,7 +813,7 @@ ciss_ldid(struct ciss_softc *sc, int tar
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_IN;
 	cmd->tmo = htole16(0);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_GET;
 	cmd->cdb[1] = target;
 	cmd->cdb[6] = CISS_CMS_CTRL_LDIDEXT;
@@ -841,7 +841,7 @@ ciss_ldstat(struct ciss_softc *sc, int t
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_IN;
 	cmd->tmo = htole16(0);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_GET;
 	cmd->cdb[1] = target;
 	cmd->cdb[6] = CISS_CMS_CTRL_LDSTAT;
@@ -869,7 +869,7 @@ ciss_pdid(struct ciss_softc *sc, u_int8_
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_IN;
 	cmd->tmo = htole16(0);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_GET;
 	cmd->cdb[2] = drv;
 	cmd->cdb[6] = CISS_CMS_CTRL_PDID;
@@ -913,7 +913,7 @@ ciss_pdscan(struct ciss_softc *sc, int l
 	if (!ldp)
 		return NULL;
 
-	bzero(&ldp->bling, sizeof(ldp->bling));
+	memset(&ldp->bling, 0, sizeof(ldp->bling));
 	ldp->ndrives = k;
 	ldp->xname[0] = 0;
 	bcopy(buf, ldp->tgts, k);
@@ -940,7 +940,7 @@ ciss_scsi_raw_cmd(struct scsipi_channel 
 	case ADAPTER_REQ_RUN_XFER:
 		if (xs->cmdlen > CISS_MAX_CDB) {
 			CISS_DPRINTF(CISS_D_CMD, ("CDB too big %p ", xs));
-			bzero(&xs->sense, sizeof(xs->sense));
+			memset(&xs->sense, 0, sizeof(xs->sense));
 			printf("ciss driver stuffup in %s:%d: %s()\n",
 			       __FILE__, __LINE__, __func__);
 			xs->error = XS_DRIVER_STUFFUP;
@@ -966,7 +966,7 @@ ciss_scsi_raw_cmd(struct scsipi_channel 
 		else if (xs->xs_control & XS_CTL_DATA_OUT)
 			cmd->flags |= CISS_CDB_OUT;
 		cmd->tmo = xs->timeout < 1000? 1 : xs->timeout / 1000;
-		bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+		memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 		bcopy(xs->cmd, &cmd->cdb[0], CISS_MAX_CDB);
 
 		if (ciss_cmd(ccb, BUS_DMA_WAITOK,
@@ -1018,7 +1018,7 @@ ciss_scsi_cmd(struct scsipi_channel *cha
 		CISS_DPRINTF(CISS_D_CMD, ("targ=%d ", target));
 		if (xs->cmdlen > CISS_MAX_CDB) {
 			CISS_DPRINTF(CISS_D_CMD, ("CDB too big %p ", xs));
-			bzero(&xs->sense, sizeof(xs->sense));
+			memset(&xs->sense, 0, sizeof(xs->sense));
 			printf("ciss driver stuffup in %s:%d: %s()\n",
 			       __FILE__, __LINE__, __func__);
 			xs->error = XS_DRIVER_STUFFUP;
@@ -1045,7 +1045,7 @@ ciss_scsi_cmd(struct scsipi_channel *cha
 		else if (xs->xs_control & XS_CTL_DATA_OUT)
 			cmd->flags |= CISS_CDB_OUT;
 		cmd->tmo = xs->timeout < 1000? 1 : xs->timeout / 1000;
-		bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+		memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 		bcopy(xs->cmd, &cmd->cdb[0], CISS_MAX_CDB);
 		CISS_DPRINTF(CISS_D_CMD, ("cmd=%02x %02x %02x %02x %02x %02x ",
 			     cmd->cdb[0], cmd->cdb[1], cmd->cdb[2],
@@ -1314,7 +1314,7 @@ ciss_ioctl_vol(struct ciss_softc *sc, st
 	}
 	strlcpy(bv->bv_vendor, "CISS", sizeof(bv->bv_vendor));
 	ldstat = sc->scratch;
-	bzero(ldstat, sizeof(*ldstat));
+	memset(ldstat, 0, sizeof(*ldstat));
 	if ((error = ciss_ldstat(sc, bv->bv_volid, ldstat))) {
 		return error;
 	}
@@ -1382,7 +1382,7 @@ ciss_blink(struct ciss_softc *sc, int ld
 	cmd->cdblen = 10;
 	cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL | CISS_CDB_OUT;
 	cmd->tmo = htole16(0);
-	bzero(&cmd->cdb[0], sizeof(cmd->cdb));
+	memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
 	cmd->cdb[0] = CISS_CMD_CTRL_SET;
 	cmd->cdb[6] = CISS_CMS_CTRL_PDBLINK;
 	cmd->cdb[7] = sizeof(*blink) >> 8;	/* biiiig endian */
@@ -1443,7 +1443,7 @@ ciss_sensor_refresh(struct sysmon_envsys
 	if (edata->sensor >= sc->maxunits)
 		return;
 
-	bzero(&bv, sizeof(bv));
+	memset(&bv, 0, sizeof(bv));
 	bv.bv_volid = edata->sensor;
 	if (ciss_ioctl_vol(sc, &bv)) {
 		return;
Index: sys/dev/ic/mfi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/mfi.c,v
retrieving revision 1.19
diff -u -p -r1.19 mfi.c
--- sys/dev/ic/mfi.c	23 Oct 2008 21:00:06 -0000	1.19
+++ sys/dev/ic/mfi.c	19 Dec 2008 18:58:05 -0000
@@ -1107,7 +1107,7 @@ mfi_scsipi_request(struct scsipi_channel
 			printf("%s: mfi_scsipi_request poll failed\n",
 			    DEVNAME(sc));
 			mfi_put_ccb(ccb);
-			bzero(&xs->sense, sizeof(xs->sense));
+			memset(&xs->sense, 0, sizeof(xs->sense));
 			xs->sense.scsi_sense.response_code =
 			    SSD_RCODE_VALID | SSD_RCODE_CURRENT;
 			xs->sense.scsi_sense.flags = SKEY_ILLEGAL_REQUEST;
@@ -1934,7 +1934,7 @@ mfi_sensor_refresh(struct sysmon_envsys 
 	if (edata->sensor >= sc->sc_ld_cnt)
 		return;
 
-	bzero(&bv, sizeof(bv));
+	memset(&bv, 0, sizeof(bv));
 	bv.bv_volid = edata->sensor;
 	s = splbio();
 	if (mfi_ioctl_vol(sc, &bv)) {
Index: sys/dev/ic/mpt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/mpt.c,v
retrieving revision 1.10
diff -u -p -r1.10 mpt.c
--- sys/dev/ic/mpt.c	27 Jul 2007 18:38:13 -0000	1.10
+++ sys/dev/ic/mpt.c	19 Dec 2008 18:58:05 -0000
@@ -433,7 +433,7 @@ mpt_get_iocfacts(mpt_softc_t *mpt, MSG_I
 	MSG_IOC_FACTS f_req;
 	int error;
 
-	bzero(&f_req, sizeof f_req);
+	memset(&f_req, 0, sizeof f_req);
 	f_req.Function = MPI_FUNCTION_IOC_FACTS;
 	f_req.MsgContext =  0x12071942;
 	error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req);
@@ -450,7 +450,7 @@ mpt_get_portfacts(mpt_softc_t *mpt, MSG_
 	int error;
 
 	/* XXX: Only getting PORT FACTS for Port 0 */
-	bzero(&f_req, sizeof f_req);
+	memset(&f_req, 0, sizeof f_req);
 	f_req.Function = MPI_FUNCTION_PORT_FACTS;
 	f_req.MsgContext =  0x12071943;
 	error = mpt_send_handshake_cmd(mpt, sizeof f_req, &f_req);
@@ -473,7 +473,7 @@ mpt_send_ioc_init(mpt_softc_t *mpt, u_in
 	MSG_IOC_INIT init;
 	MSG_IOC_INIT_REPLY reply;
 
-	bzero(&init, sizeof init);
+	memset(&init, 0, sizeof init);
 	init.WhoInit = who;
 	init.Function = MPI_FUNCTION_IOC_INIT;
 	init.MaxDevices = mpt->mpt_max_devices;
@@ -509,7 +509,7 @@ mpt_read_cfg_header(mpt_softc_t *mpt, in
 	req = mpt_get_request(mpt);
 
 	cfgp = req->req_vbuf;
-	bzero(cfgp, sizeof *cfgp);
+	memset(cfgp, 0, sizeof *cfgp);
 
 	cfgp->Action = MPI_CONFIG_ACTION_PAGE_HEADER;
 	cfgp->Function = MPI_FUNCTION_CONFIG;
@@ -561,7 +561,7 @@ mpt_read_cfg_page(mpt_softc_t *mpt, int 
 	req = mpt_get_request(mpt);
 
 	cfgp = req->req_vbuf;
-	bzero(cfgp, MPT_REQUEST_AREA);
+	memset(cfgp, 0, MPT_REQUEST_AREA);
 	cfgp->Action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
 	cfgp->Function = MPI_FUNCTION_CONFIG;
 	cfgp->Header = *hdr;
@@ -635,7 +635,7 @@ mpt_write_cfg_page(mpt_softc_t *mpt, int
 	req = mpt_get_request(mpt);
 
 	cfgp = req->req_vbuf;
-	bzero(cfgp, sizeof *cfgp);
+	memset(cfgp, 0, sizeof *cfgp);
 
 	hdr_attr = hdr->PageType & MPI_CONFIG_PAGEATTR_MASK;
 	if (hdr_attr != MPI_CONFIG_PAGEATTR_CHANGEABLE &&
@@ -929,7 +929,7 @@ mpt_send_port_enable(mpt_softc_t *mpt, i
 	req = mpt_get_request(mpt);
 
 	enable_req = req->req_vbuf;
-	bzero(enable_req, sizeof *enable_req);
+	memset(enable_req, 0, sizeof *enable_req);
 
 	enable_req->Function   = MPI_FUNCTION_PORT_ENABLE;
 	enable_req->MsgContext = req->index | 0x80000000;
@@ -969,7 +969,7 @@ mpt_send_event_request(mpt_softc_t *mpt,
 	req = mpt_get_request(mpt);
 
 	enable_req = req->req_vbuf;
-	bzero(enable_req, sizeof *enable_req);
+	memset(enable_req, 0, sizeof *enable_req);
 
 	enable_req->Function   = MPI_FUNCTION_EVENT_NOTIFICATION;
 	enable_req->MsgContext = req->index | 0x80000000;
Index: sys/dev/ieee1394/firewire.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/firewire.c,v
retrieving revision 1.22
diff -u -p -r1.22 firewire.c
--- sys/dev/ieee1394/firewire.c	12 Nov 2008 12:36:11 -0000	1.22
+++ sys/dev/ieee1394/firewire.c	19 Dec 2008 18:58:05 -0000
@@ -782,7 +782,7 @@ fw_init_crom(struct firewire_comm *fc)
 		return;
 
 	src = &fc->crom_src_buf->src;
-	bzero(src, sizeof(struct crom_src));
+	memset(src, 0, sizeof(struct crom_src));
 
 	/* BUS info sample */
 	src->hdr.info_len = 4;
@@ -825,7 +825,7 @@ fw_reset_crom(struct firewire_comm *fc)
 
 	STAILQ_INIT(&src->chunk_list);
 
-	bzero(root, sizeof(struct crom_chunk));
+	memset(root, 0, sizeof(struct crom_chunk));
 	crom_add_chunk(src, NULL, root, 0);
 	crom_add_entry(root, CSRKEY_NCAP, 0x0083c0); /* XXX */
 	/* private company_id */
@@ -1687,7 +1687,7 @@ fw_explore_node(struct fw_device *dfwdev
 		return (0);
 	}
 
-	bzero(&fwdev->csrrom[0], CROMSIZE);
+	memset(&fwdev->csrrom[0], 0, CROMSIZE);
 
 	/* copy first quad and bus info block */
 	bcopy(&csr[0], &fwdev->csrrom[0], sizeof(uint32_t) * 5);
@@ -2349,7 +2349,7 @@ fw_bmr(struct firewire_comm *fc)
 	if (cmstr == fc->nodeid || cmstr == -1)
 		return 0;
 	/* Bus probe has not finished, make dummy fwdev for cmstr */
-	bzero(&fwdev, sizeof(fwdev));
+	memset(&fwdev, 0, sizeof(fwdev));
 	fwdev.fc = fc;
 	fwdev.dst = cmstr;
 	fwdev.speed = 0;
Index: sys/dev/ieee1394/fw_port.h
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/fw_port.h,v
retrieving revision 1.30
diff -u -p -r1.30 fw_port.h
--- sys/dev/ieee1394/fw_port.h	24 Jun 2008 10:12:42 -0000	1.30
+++ sys/dev/ieee1394/fw_port.h	19 Dec 2008 18:58:06 -0000
@@ -401,7 +401,7 @@ typedef bus_dma_tag_t fw_bus_dma_tag_t;
 #define SBP_ATTACH_START          		\
         struct cam_devq *devq;			\
 						\
-        bzero(sbp, sizeof(struct sbp_softc));	\
+        memset(sbp, 0, sizeof(struct sbp_softc));	\
 	sbp->fd.dev = dev
 #define SBP_SCSIBUS_ATTACH						    \
 	do {								    \
Index: sys/dev/ieee1394/fwcrom.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/fwcrom.c,v
retrieving revision 1.7
diff -u -p -r1.7 fwcrom.c
--- sys/dev/ieee1394/fwcrom.c	2 May 2008 19:50:04 -0000	1.7
+++ sys/dev/ieee1394/fwcrom.c	19 Dec 2008 18:58:06 -0000
@@ -489,7 +489,7 @@ crom_add_simple_text(struct crom_src *sr
 	tl->spec_id = 0;
 	tl->spec_type = 0;
 	tl->lang_id = 0;
-	bzero(&t[0], roundup2(len, sizeof(uint32_t)));
+	memset(&t[0], 0, roundup2(len, sizeof(uint32_t)));
 	bcopy(buf, &t[0], len);
 	p = (uint32_t *)&t[0];
 	for (i = 0; i < howmany(len, sizeof(uint32_t)); i ++)
@@ -577,19 +577,19 @@ main () {
 	uint32_t buf[256], *p;
 	int i;
 
-	bzero(&src, sizeof(src));
-	bzero(&root, sizeof(root));
-	bzero(&unit1, sizeof(unit1));
-	bzero(&unit2, sizeof(unit2));
-	bzero(&unit3, sizeof(unit3));
-	bzero(&text1, sizeof(text1));
-	bzero(&text2, sizeof(text2));
-	bzero(&text3, sizeof(text3));
-	bzero(&text3, sizeof(text4));
-	bzero(&text3, sizeof(text5));
-	bzero(&text3, sizeof(text6));
-	bzero(&text3, sizeof(text7));
-	bzero(buf, sizeof(buf));
+	memset(&src, 0, sizeof(src));
+	memset(&root, 0, sizeof(root));
+	memset(&unit1, 0, sizeof(unit1));
+	memset(&unit2, 0, sizeof(unit2));
+	memset(&unit3, 0, sizeof(unit3));
+	memset(&text1, 0, sizeof(text1));
+	memset(&text2, 0, sizeof(text2));
+	memset(&text3, 0, sizeof(text3));
+	memset(&text3, 0, sizeof(text4));
+	memset(&text3, 0, sizeof(text5));
+	memset(&text3, 0, sizeof(text6));
+	memset(&text3, 0, sizeof(text7));
+	memset(buf, 0, sizeof(buf));
 
 	/* BUS info sample */
 	src.hdr.info_len = 4;
Index: sys/dev/ieee1394/fwdev.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/fwdev.c,v
retrieving revision 1.14
diff -u -p -r1.14 fwdev.c
--- sys/dev/ieee1394/fwdev.c	11 Dec 2007 11:34:08 -0000	1.14
+++ sys/dev/ieee1394/fwdev.c	19 Dec 2008 18:58:06 -0000
@@ -467,7 +467,7 @@ fw_write_async(struct fw_drv1 *d, struct
 	const struct tcode_info *tinfo;
 	int err;
 
-	bzero(&pkt, sizeof(struct fw_pkt));
+	memset(&pkt, 0, sizeof(struct fw_pkt));
 	if ((err = uiomove((void *)&pkt, sizeof(uint32_t), uio)))
 		return (err);
 	tinfo = &d->fc->tcode[pkt.mode.hdr.tcode];
@@ -693,13 +693,13 @@ FW_IOCTL(fw)
 		bcopy(ibufreq, &d->bufreq, sizeof(d->bufreq));
 		break;
 	case FW_GSTBUF:
-		bzero(&ibufreq->rx, sizeof(ibufreq->rx));
+		memset(&ibufreq->rx, 0, sizeof(ibufreq->rx));
 		if (ir != NULL) {
 			ibufreq->rx.nchunk = ir->bnchunk;
 			ibufreq->rx.npacket = ir->bnpacket;
 			ibufreq->rx.psize = ir->psize;
 		}
-		bzero(&ibufreq->tx, sizeof(ibufreq->tx));
+		memset(&ibufreq->tx, 0, sizeof(ibufreq->tx));
 		if (it != NULL) {
 			ibufreq->tx.nchunk = it->bnchunk;
 			ibufreq->tx.npacket = it->bnpacket;
Index: sys/dev/ieee1394/fwohci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/fwohci.c,v
retrieving revision 1.115
diff -u -p -r1.115 fwohci.c
--- sys/dev/ieee1394/fwohci.c	12 Nov 2008 12:36:11 -0000	1.115
+++ sys/dev/ieee1394/fwohci.c	19 Dec 2008 18:58:07 -0000
@@ -777,7 +777,7 @@ fwohci_init(struct fwohci_softc *sc, dev
 	}
 
 #if 0
-	bzero(&sc->fc.config_rom[0], CROMSIZE);
+	memset(&sc->fc.config_rom[0], 0, CROMSIZE);
 	sc->fc.config_rom[1] = 0x31333934;
 	sc->fc.config_rom[2] = 0xf000a002;
 	sc->fc.config_rom[3] = OREAD(sc, OHCI_EUID_HI);
@@ -2696,7 +2696,7 @@ fwohci_add_tx_buf(struct fwohci_dbch *db
 	FWOHCI_DMA_WRITE(db[0].db.desc.cmd,
 		OHCI_OUTPUT_MORE | OHCI_KEY_ST2 | 8);
 	FWOHCI_DMA_WRITE(db[0].db.desc.addr, 0);
-	bzero((void *)&db[1].db.immed[0], sizeof(db[1].db.immed));
+	memset((void *)&db[1].db.immed[0], 0, sizeof(db[1].db.immed));
 	FWOHCI_DMA_WRITE(db[2].db.desc.addr,
 	    fwdma_bus_addr(it->buf, poffset) + sizeof(uint32_t));
 
Index: sys/dev/ieee1394/if_fwip.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/if_fwip.c,v
retrieving revision 1.17
diff -u -p -r1.17 if_fwip.c
--- sys/dev/ieee1394/if_fwip.c	12 Nov 2008 12:36:11 -0000	1.17
+++ sys/dev/ieee1394/if_fwip.c	19 Dec 2008 18:58:07 -0000
@@ -607,7 +607,7 @@ fwip_post_busreset(void *arg)
 	root = fwip->fd.fc->crom_root;
 
 	/* RFC2734 IPv4 over IEEE1394 */
-	bzero(&fwip->unit4, sizeof(struct crom_chunk));
+	memset(&fwip->unit4, 0, sizeof(struct crom_chunk));
 	crom_add_chunk(src, root, &fwip->unit4, CROM_UDIR);
 	crom_add_entry(&fwip->unit4, CSRKEY_SPEC, CSRVAL_IETF);
 	crom_add_simple_text(src, &fwip->unit4, &fwip->spec4, "IANA");
@@ -615,7 +615,7 @@ fwip_post_busreset(void *arg)
 	crom_add_simple_text(src, &fwip->unit4, &fwip->ver4, "IPv4");
 
 	/* RFC3146 IPv6 over IEEE1394 */
-	bzero(&fwip->unit6, sizeof(struct crom_chunk));
+	memset(&fwip->unit6, 0, sizeof(struct crom_chunk));
 	crom_add_chunk(src, root, &fwip->unit6, CROM_UDIR);
 	crom_add_entry(&fwip->unit6, CSRKEY_SPEC, CSRVAL_IETF);
 	crom_add_simple_text(src, &fwip->unit6, &fwip->spec6, "IANA");
Index: sys/dev/ieee1394/sbp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/sbp.c,v
retrieving revision 1.22
diff -u -p -r1.22 sbp.c
--- sys/dev/ieee1394/sbp.c	12 Nov 2008 12:36:11 -0000	1.22
+++ sys/dev/ieee1394/sbp.c	19 Dec 2008 18:58:08 -0000
@@ -822,8 +822,8 @@ sbp_probe_lun(struct sbp_dev *sdev)
 	struct crom_context c, *cc = &c;
 	struct csrreg *reg;
 
-	bzero(sdev->vendor, sizeof(sdev->vendor));
-	bzero(sdev->product, sizeof(sdev->product));
+	memset(sdev->vendor, 0, sizeof(sdev->vendor));
+	memset(sdev->product, 0, sizeof(sdev->product));
 
 	fwdev = sdev->target->fwdev;
 	crom_init_context(cc, fwdev->csrrom);
@@ -1584,7 +1584,7 @@ sbp_mgm_orb(struct sbp_dev *sdev, int fu
 	ocb->flags = OCB_ACT_MGM;
 	ocb->sdev = sdev;
 
-	bzero((void *)ocb->orb, sizeof(ocb->orb));
+	memset((void *)ocb->orb, 0, sizeof(ocb->orb));
 	ocb->orb[6] = htonl((nid << 16) | SBP_BIND_HI);
 	ocb->orb[7] = htonl(SBP_DEV2ADDR(dv_unit, sdev->lun_id));
 
Index: sys/dev/if_ndis/if_ndis.c
===================================================================
RCS file: /cvsroot/src/sys/dev/if_ndis/if_ndis.c,v
retrieving revision 1.20
diff -u -p -r1.20 if_ndis.c
--- sys/dev/if_ndis/if_ndis.c	12 Nov 2008 12:36:11 -0000	1.20
+++ sys/dev/if_ndis/if_ndis.c	19 Dec 2008 18:58:08 -0000
@@ -881,7 +881,7 @@ ndis_attach(dev)
 		free(ntl, M_DEVBUF);
 nonettypes:
 		len = sizeof(rates);
-		bzero((char *)&rates, len);
+		memset((char *)&rates, 0, len);
 		r = ndis_get_info(sc, OID_802_11_SUPPORTED_RATES,
 		    (void *)rates, &len);
 		if (r)
@@ -2109,7 +2109,7 @@ ic = &sc->ic;
 #endif /* __NetBSD__ */
 		for (i = 0; i < IEEE80211_WEP_NKID; i++) {		
 			if (ic->ic_nw_keys[i].wk_len) {
-				bzero((char *)&wep, sizeof(wep));
+				memset((char *)&wep, 0, sizeof(wep));
 				wep.nw_keylen = ic->ic_nw_keys[i].wk_len;
 #ifdef notdef
 				/* 5 and 13 are the only valid key lengths */
@@ -2206,7 +2206,7 @@ ic = &sc->ic;
 #endif
 
 	len = sizeof(config);
-	bzero((char *)&config, len);
+	memset((char *)&config, 0, len);
 	config.nc_length = len;
 	config.nc_fhconfig.ncf_length = sizeof(ndis_80211_config_fh);
 	rval = ndis_get_info(sc, OID_802_11_CONFIGURATION, &config, &len); 
@@ -2251,7 +2251,7 @@ ic = &sc->ic;
 	/* Set SSID -- always do this last. */
 
 	len = sizeof(ssid);
-	bzero((char *)&ssid, len);
+	memset((char *)&ssid, 0, len);
 	ssid.ns_ssidlen = ic->ic_des_esslen;
 	if (ssid.ns_ssidlen == 0) {
 		ssid.ns_ssidlen = 1;
@@ -2432,7 +2432,7 @@ ndis_getstate_80211(sc)
 		return;
 
 	len = sizeof(ssid);
-	bzero((char *)&ssid, len);
+	memset((char *)&ssid, 0, len);
 	rval = ndis_get_info(sc, OID_802_11_SSID, &ssid, &len);
 
 	if (rval)
@@ -2485,7 +2485,7 @@ ndis_getstate_80211(sc)
 	}
 
 	len = sizeof(config);
-	bzero((char *)&config, len);
+	memset((char *)&config, 0, len);
 	config.nc_length = len;
 	config.nc_fhconfig.ncf_length = sizeof(ndis_80211_config_fh);
 	rval = ndis_get_info(sc, OID_802_11_CONFIGURATION, &config, &len);   
@@ -2678,7 +2678,7 @@ ndis_wi_ioctl_get(ifp, command, data)
 		api = (struct wi_apinfo *)&((int *)&wreq.wi_val)[1];
 		wb = bl->nblx_bssid;
 		while (maxaps--) {
-			bzero(api, sizeof(*api));
+			memset(api, 0, sizeof(*api));
 			bcopy(&wb->nwbx_macaddr, &api->bssid,
 			    sizeof(api->bssid));
 			api->namelen = wb->nwbx_ssid.ns_ssidlen;
Index: sys/dev/isapnp/isic_isapnp_dynalink.c
===================================================================
RCS file: /cvsroot/src/sys/dev/isapnp/isic_isapnp_dynalink.c,v
retrieving revision 1.10
diff -u -p -r1.10 isic_isapnp_dynalink.c
--- sys/dev/isapnp/isic_isapnp_dynalink.c	8 Apr 2008 20:09:27 -0000	1.10
+++ sys/dev/isapnp/isic_isapnp_dynalink.c	19 Dec 2008 18:58:08 -0000
@@ -357,7 +357,7 @@ isapnp_match_dynalink(struct device *par
 	struct isic_softc dummysc, *sc = &dummysc;
 	pnp_resource_t res;
 	char *ids[] = {"ASU1688", NULL};
-	bzero(&res, sizeof res);
+	memset(&res, 0, sizeof res);
 	res.res_irq[0].irq_level = ia->ia_irq;
 	res.res_port[0].prt_base = ia->ia_iobase;
 	res.res_port[0].prt_length = 4;
Index: sys/dev/marvell/gtmpsc.c
===================================================================
RCS file: /cvsroot/src/sys/dev/marvell/gtmpsc.c,v
retrieving revision 1.31
diff -u -p -r1.31 gtmpsc.c
--- sys/dev/marvell/gtmpsc.c	8 Sep 2008 23:36:54 -0000	1.31
+++ sys/dev/marvell/gtmpsc.c	19 Dec 2008 18:58:08 -0000
@@ -1057,7 +1057,7 @@ gtmpsc_hackinit(struct gtmpsc_softc *sc,
 
 	DPRINTF(("hackinit\n"));
 
-	bzero(sc, sizeof(struct gtmpsc_softc));
+	memset(sc, 0, sizeof(struct gtmpsc_softc));
 	sc->gtmpsc_memt = memt;
 	sc->gtmpsc_memh = memh;
 	sc->gtmpsc_unit = unit;
@@ -1812,7 +1812,7 @@ gtmpsc_mem_printf(const char *fmt, ...)
 	static unsigned char *p = gtmpsc_print_buf;
 
 	if (p >= &gtmpsc_print_buf[GTMPSC_PRINT_BUF_SIZE - 128]) {
-		bzero(gtmpsc_print_buf, GTMPSC_PRINT_BUF_SIZE);
+		memset(gtmpsc_print_buf, 0, GTMPSC_PRINT_BUF_SIZE);
 		p = gtmpsc_print_buf;
 	}
 	va_start(ap, fmt);
Index: sys/dev/mscp/mscp_disk.c
===================================================================
RCS file: /cvsroot/src/sys/dev/mscp/mscp_disk.c,v
retrieving revision 1.60
diff -u -p -r1.60 mscp_disk.c
--- sys/dev/mscp/mscp_disk.c	11 Jun 2008 17:32:30 -0000	1.60
+++ sys/dev/mscp/mscp_disk.c	19 Dec 2008 18:58:09 -0000
@@ -511,7 +511,7 @@ raioctl(dev, cmd, data, flag, l)
 #else
 		tp = (struct disklabel *)data;
 #endif
-		bzero(tp, sizeof(struct disklabel));
+		memset(tp, 0, sizeof(struct disklabel));
 		tp->d_secsize = lp->d_secsize;
 		tp->d_nsectors = lp->d_nsectors;
 		tp->d_ntracks = lp->d_ntracks;
Index: sys/dev/ofisa/ofisa.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ofisa/ofisa.c,v
retrieving revision 1.18
diff -u -p -r1.18 ofisa.c
--- sys/dev/ofisa/ofisa.c	19 Oct 2007 12:00:38 -0000	1.18
+++ sys/dev/ofisa/ofisa.c	19 Dec 2008 18:58:09 -0000
@@ -127,7 +127,7 @@ ofisaattach(parent, self, aux)
 		if (ofisa_ignore_child(oba->oba_phandle, child))
 			continue;
 
-		bzero(&aa, sizeof aa);
+		memset(&aa, 0, sizeof aa);
 
 		aa.oba.oba_busname = "ofw";			/* XXX */
 		aa.oba.oba_phandle = child;
Index: sys/dev/onewire/onewire.c
===================================================================
RCS file: /cvsroot/src/sys/dev/onewire/onewire.c,v
retrieving revision 1.10
diff -u -p -r1.10 onewire.c
--- sys/dev/onewire/onewire.c	17 Dec 2008 20:51:34 -0000	1.10
+++ sys/dev/onewire/onewire.c	19 Dec 2008 18:58:09 -0000
@@ -419,7 +419,7 @@ onewire_scan(struct onewire_softc *sc)
 			}
 		}
 		if (!present) {
-			bzero(&oa, sizeof(oa));
+			memset(&oa, 0, sizeof(oa));
 			oa.oa_onewire = sc;
 			oa.oa_rom = rom;
 			if ((dev = config_found(sc->sc_dev, &oa,
Index: sys/dev/pci/alipm.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/alipm.c,v
retrieving revision 1.1
diff -u -p -r1.1 alipm.c
--- sys/dev/pci/alipm.c	29 Oct 2008 17:26:56 -0000	1.1
+++ sys/dev/pci/alipm.c	19 Dec 2008 18:58:09 -0000
@@ -208,7 +208,7 @@ alipm_attach(struct device *parent, stru
 	sc->sc_smb_tag.ic_release_bus = alipm_smb_release_bus;
 	sc->sc_smb_tag.ic_exec = alipm_smb_exec;
 
-	bzero(&iba, sizeof iba);
+	memset(&iba, 0, sizeof iba);
 	iba.iba_tag = &sc->sc_smb_tag;
 	(void)config_found_ia(&sc->sc_dev, "i2cbus", &iba, iicbus_print);
 
Index: sys/dev/pci/auixp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/auixp.c,v
retrieving revision 1.28
diff -u -p -r1.28 auixp.c
--- sys/dev/pci/auixp.c	10 Apr 2008 19:13:36 -0000	1.28
+++ sys/dev/pci/auixp.c	19 Dec 2008 18:58:09 -0000
@@ -611,7 +611,7 @@ auixp_link_daisychain(struct auixp_softc
 	/* program the requested number of blocks */
 	for (i = 0; i < blocks; i++) {
 		/* clear the block just in case */
-		bzero(caddr_v, sizeof(atiixp_dma_desc_t));
+		memset(caddr_v, 0, sizeof(atiixp_dma_desc_t));
 
 		/* round robin the chain dma addresses for its successor */
 		next_caddr_v = caddr_v + 1;
@@ -1553,7 +1553,7 @@ auixp_autodetect_codecs(struct auixp_sof
 	/* Attach AC97 host interfaces */
 	for (codec_nr = 0; codec_nr < ATI_IXP_CODECS; codec_nr++) {
 		codec = &sc->sc_codec[codec_nr];
-		bzero(codec, sizeof(struct auixp_codec));
+		memset(codec, 0, sizeof(struct auixp_codec));
 
 		codec->sc       = sc;
 		codec->codec_nr = codec_nr;
Index: sys/dev/pci/cxgb_sge.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/cxgb_sge.c,v
retrieving revision 1.10
diff -u -p -r1.10 cxgb_sge.c
--- sys/dev/pci/cxgb_sge.c	19 Dec 2008 18:49:38 -0000	1.10
+++ sys/dev/pci/cxgb_sge.c	19 Dec 2008 18:58:10 -0000
@@ -792,7 +792,7 @@ alloc_ring(adapter_t *sc, size_t nelem, 
     }
 
     bus_dmamap_load(*tag, *map, p, len, alloc_ring_cb, phys, 0);
-    bzero(p, len);
+    memset(p, 0, len);
     *(void **)desc = p;
 
     if (sw_size) {
@@ -837,7 +837,7 @@ alloc_ring(adapter_t *sc, size_t nelem, 
         return (ENOMEM);
     }
 
-    bzero(p, len);
+    memset(p, 0, len);
     *(void **)desc = p;
 
     if (sw_size)
@@ -1882,7 +1882,7 @@ t3_free_qset(adapter_t *sc, struct sge_q
 #endif
     }
 
-    bzero(q, sizeof(*q));
+    memset(q, 0, sizeof(*q));
 }
 
 /**
Index: sys/dev/pci/hifn7751.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/hifn7751.c,v
retrieving revision 1.37
diff -u -p -r1.37 hifn7751.c
--- sys/dev/pci/hifn7751.c	10 Apr 2008 19:13:36 -0000	1.37
+++ sys/dev/pci/hifn7751.c	19 Dec 2008 18:58:10 -0000
@@ -325,7 +325,7 @@ hifn_attach(struct device *parent, struc
 	}
 	sc->sc_dmamap = dmamap;
 	sc->sc_dma = (struct hifn_dma *)kva;
-	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
+	memset(sc->sc_dma, 0, sizeof(*sc->sc_dma));
 
 	hifn_reset_board(sc, 0);
 
@@ -732,7 +732,7 @@ hifn_reset_board(struct hifn_softc *sc, 
 		hifn_reset_puc(sc);
 	}
 
-	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
+	memset(sc->sc_dma, 0, sizeof(*sc->sc_dma));
 
 	/* Bring dma unit out of reset */
 	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
@@ -1194,7 +1194,7 @@ hifn_writeramaddr(struct hifn_softc *sc,
 	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
 
 	/* build write command */
-	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
+	memset(dma->command_bufs[cmdi], 0, HIFN_MAX_COMMAND);
 	*(struct hifn_base_command *)dma->command_bufs[cmdi] = wc;
 	bcopy(data, &dma->test_src, sizeof(dma->test_src));
 
@@ -1258,7 +1258,7 @@ hifn_readramaddr(struct hifn_softc *sc, 
 	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA |
 	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
 
-	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
+	memset(dma->command_bufs[cmdi], 0, HIFN_MAX_COMMAND);
 	*(struct hifn_base_command *)dma->command_bufs[cmdi] = rc;
 
 	dma->srcr[srci].p = htole32(sc->sc_dmamap->dm_segs[0].ds_addr +
@@ -1439,7 +1439,7 @@ hifn_write_command(struct hifn_command *
 				len -= clen;
 				buf_pos += clen;
 			} while (len > 0);
-			bzero(buf_pos, 4);
+			memset(buf_pos, 0, 4);
 			buf_pos += 4;
 			break;
 		case HIFN_CRYPT_CMD_ALG_AES:
@@ -1468,7 +1468,7 @@ hifn_write_command(struct hifn_command *
 
 	if ((cmd->base_masks & (HIFN_BASE_CMD_MAC | HIFN_BASE_CMD_CRYPT |
 	    HIFN_BASE_CMD_COMP)) == 0) {
-		bzero(buf_pos, 8);
+		memset(buf_pos, 0, 8);
 		buf_pos += 8;
 	}
 
@@ -2143,7 +2143,7 @@ hifn_freesession(void *arg, u_int64_t ti
 	if (session >= sc->sc_maxses)
 		return (EINVAL);
 
-	bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session]));
+	memset(&sc->sc_sessions[session], 0, sizeof(sc->sc_sessions[session]));
 	return (0);
 }
 
Index: sys/dev/pci/ichsmb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/ichsmb.c,v
retrieving revision 1.18
diff -u -p -r1.18 ichsmb.c
--- sys/dev/pci/ichsmb.c	16 Dec 2008 22:35:33 -0000	1.18
+++ sys/dev/pci/ichsmb.c	19 Dec 2008 18:58:10 -0000
@@ -174,7 +174,7 @@ ichsmb_attach(device_t parent, device_t 
 	sc->sc_i2c_tag.ic_release_bus = ichsmb_i2c_release_bus;
 	sc->sc_i2c_tag.ic_exec = ichsmb_i2c_exec;
 
-	bzero(&iba, sizeof(iba));
+	memset(&iba, 0, sizeof(iba));
 	iba.iba_type = I2C_TYPE_SMBUS;
 	iba.iba_tag = &sc->sc_i2c_tag;
 	config_found(self, &iba, iicbus_print);
Index: sys/dev/pci/if_bnx.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_bnx.c,v
retrieving revision 1.20
diff -u -p -r1.20 if_bnx.c
--- sys/dev/pci/if_bnx.c	9 Sep 2008 20:12:18 -0000	1.20
+++ sys/dev/pci/if_bnx.c	19 Dec 2008 18:58:11 -0000
@@ -2000,7 +2000,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
 	}
 
 	sc->status_block_paddr = sc->status_map->dm_segs[0].ds_addr;
-	bzero(sc->status_block, BNX_STATUS_BLK_SZ);
+	memset(sc->status_block, 0, BNX_STATUS_BLK_SZ);
 
 	/* DRC - Fix for 64 bit addresses. */
 	DBPRINT(sc, BNX_INFO, "status_block_paddr = 0x%08X\n",
@@ -2044,7 +2044,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
 	}
 
 	sc->stats_block_paddr = sc->stats_map->dm_segs[0].ds_addr;
-	bzero(sc->stats_block, BNX_STATS_BLK_SZ);
+	memset(sc->stats_block, 0, BNX_STATS_BLK_SZ);
 
 	/* DRC - Fix for 64 bit address. */
 	DBPRINT(sc,BNX_INFO, "stats_block_paddr = 0x%08X\n", 
@@ -2157,7 +2157,7 @@ bnx_dma_alloc(struct bnx_softc *sc)
 			goto bnx_dma_alloc_exit;
 		}
 
-		bzero(sc->rx_bd_chain[i], BNX_RX_CHAIN_PAGE_SZ);
+		memset(sc->rx_bd_chain[i], 0, BNX_RX_CHAIN_PAGE_SZ);
 		sc->rx_bd_chain_paddr[i] =
 		    sc->rx_bd_chain_map[i]->dm_segs[0].ds_addr;
 
@@ -3323,7 +3323,7 @@ bnx_free_tx_chain(struct bnx_softc *sc)
 
 	/* Clear each TX chain page. */
 	for (i = 0; i < TX_PAGES; i++) {
-		bzero((char *)sc->tx_bd_chain[i], BNX_TX_CHAIN_PAGE_SZ);
+		memset((char *)sc->tx_bd_chain[i], 0, BNX_TX_CHAIN_PAGE_SZ);
 		bus_dmamap_sync(sc->bnx_dmatag, sc->tx_bd_chain_map[i], 0,
 		    BNX_TX_CHAIN_PAGE_SZ, BUS_DMASYNC_PREWRITE);
 	}
@@ -3451,7 +3451,7 @@ bnx_free_rx_chain(struct bnx_softc *sc)
 
 	/* Clear each RX chain page. */
 	for (i = 0; i < RX_PAGES; i++)
-		bzero((char *)sc->rx_bd_chain[i], BNX_RX_CHAIN_PAGE_SZ);
+		memset((char *)sc->rx_bd_chain[i], 0, BNX_RX_CHAIN_PAGE_SZ);
 
 	/* Check if we lost any mbufs in the process. */
 	DBRUNIF((sc->rx_mbuf_alloc),
Index: sys/dev/pci/if_de.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_de.c,v
retrieving revision 1.129
diff -u -p -r1.129 if_de.c
--- sys/dev/pci/if_de.c	7 Nov 2008 00:20:07 -0000	1.129
+++ sys/dev/pci/if_de.c	19 Dec 2008 18:58:12 -0000
@@ -5689,7 +5689,7 @@ tulip_pci_attach(
     sc = (tulip_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
     if (sc == NULL)
 	return;
-    bzero(sc, sizeof(*sc));				/* Zero out the softc*/
+    memset(sc, 0, sizeof(*sc));				/* Zero out the softc*/
 #endif
 
     PCI_GETBUSDEVINFO(sc);
Index: sys/dev/pci/if_jme.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_jme.c,v
retrieving revision 1.4
diff -u -p -r1.4 if_jme.c
--- sys/dev/pci/if_jme.c	16 Oct 2008 21:22:32 -0000	1.4
+++ sys/dev/pci/if_jme.c	19 Dec 2008 18:58:12 -0000
@@ -1848,7 +1848,7 @@ jme_set_filter(jme_softc_t *sc)
 	 * select the bit within the register.
 	 */
 	rxcfg |= RXMAC_MULTICAST;
-	bzero(hash, sizeof(hash));
+	memset(hash, 0, sizeof(hash));
 
 	ETHER_FIRST_MULTI(step, &sc->jme_ec, enm);
 	while (enm != NULL) {
Index: sys/dev/pci/if_msk.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_msk.c,v
retrieving revision 1.22
diff -u -p -r1.22 if_msk.c
--- sys/dev/pci/if_msk.c	18 Nov 2008 09:30:43 -0000	1.22
+++ sys/dev/pci/if_msk.c	19 Dec 2008 18:58:13 -0000
@@ -1061,7 +1061,7 @@ msk_attach(struct device *parent, struct
 		goto fail_3;
 	}
         sc_if->sk_rdata = (struct msk_ring_data *)kva;
-	bzero(sc_if->sk_rdata, sizeof(struct msk_ring_data));
+	memset(sc_if->sk_rdata, 0, sizeof(struct msk_ring_data));
 
 	ifp = &sc_if->sk_ethercom.ec_if;
 	/* Try to allocate memory for jumbo buffers. */
Index: sys/dev/pci/if_nfe.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_nfe.c,v
retrieving revision 1.38
diff -u -p -r1.38 if_nfe.c
--- sys/dev/pci/if_nfe.c	16 Dec 2008 22:35:33 -0000	1.38
+++ sys/dev/pci/if_nfe.c	19 Dec 2008 18:58:13 -0000
@@ -1383,7 +1383,7 @@ nfe_alloc_rx_ring(struct nfe_softc *sc, 
 		goto fail;
 	}
 
-	bzero(*desc, NFE_RX_RING_COUNT * descsize);
+	memset(*desc, 0, NFE_RX_RING_COUNT * descsize);
 	ring->physaddr = ring->map->dm_segs[0].ds_addr;
 
 	if (sc->sc_flags & NFE_USE_JUMBO) {
@@ -1711,7 +1711,7 @@ nfe_alloc_tx_ring(struct nfe_softc *sc, 
 		goto fail;
 	}
 
-	bzero(*desc, NFE_TX_RING_COUNT * descsize);
+	memset(*desc, 0, NFE_TX_RING_COUNT * descsize);
 	ring->physaddr = ring->map->dm_segs[0].ds_addr;
 
 	for (i = 0; i < NFE_TX_RING_COUNT; i++) {
@@ -1817,8 +1817,8 @@ nfe_setmulti(struct nfe_softc *sc)
 	int i;
 
 	if ((ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) != 0) {
-		bzero(addr, ETHER_ADDR_LEN);
-		bzero(mask, ETHER_ADDR_LEN);
+		memset(addr, 0, ETHER_ADDR_LEN);
+		memset(mask, 0, ETHER_ADDR_LEN);
 		goto done;
 	}
 
@@ -1829,8 +1829,8 @@ nfe_setmulti(struct nfe_softc *sc)
 	while (enm != NULL) {
 		if (bcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
 			ifp->if_flags |= IFF_ALLMULTI;
-			bzero(addr, ETHER_ADDR_LEN);
-			bzero(mask, ETHER_ADDR_LEN);
+			memset(addr, 0, ETHER_ADDR_LEN);
+			memset(mask, 0, ETHER_ADDR_LEN);
 			goto done;
 		}
 		for (i = 0; i < ETHER_ADDR_LEN; i++) {
Index: sys/dev/pci/if_sk.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_sk.c,v
retrieving revision 1.55
diff -u -p -r1.55 if_sk.c
--- sys/dev/pci/if_sk.c	7 Nov 2008 00:20:07 -0000	1.55
+++ sys/dev/pci/if_sk.c	19 Dec 2008 18:58:13 -0000
@@ -1367,7 +1367,7 @@ sk_attach(device_t parent, device_t self
 	}
 
         sc_if->sk_rdata = (struct sk_ring_data *)kva;
-	bzero(sc_if->sk_rdata, sizeof(struct sk_ring_data));
+	memset(sc_if->sk_rdata, 0, sizeof(struct sk_ring_data));
 
 	ifp = &sc_if->sk_ethercom.ec_if;
 	/* Try to allocate memory for jumbo buffers. */
Index: sys/dev/pci/if_txp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/if_txp.c,v
retrieving revision 1.27
diff -u -p -r1.27 if_txp.c
--- sys/dev/pci/if_txp.c	7 Nov 2008 00:20:07 -0000	1.27
+++ sys/dev/pci/if_txp.c	19 Dec 2008 18:58:14 -0000
@@ -956,7 +956,7 @@ txp_alloc_rings(sc)
 		return (-1);
 	}
 	boot = (struct txp_boot_record *)sc->sc_boot_dma.dma_vaddr;
-	bzero(boot, sizeof(*boot));
+	memset(boot, 0, sizeof(*boot));
 	sc->sc_boot = boot;
 
 	/* host variables */
@@ -965,7 +965,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate host ring\n");
 		goto bail_boot;
 	}
-	bzero(sc->sc_host_dma.dma_vaddr, sizeof(struct txp_hostvar));
+	memset(sc->sc_host_dma.dma_vaddr, 0, sizeof(struct txp_hostvar));
 	boot->br_hostvar_lo = htole32(sc->sc_host_dma.dma_paddr & 0xffffffff);
 	boot->br_hostvar_hi = htole32(sc->sc_host_dma.dma_paddr >> 32);
 	sc->sc_hostvar = (struct txp_hostvar *)sc->sc_host_dma.dma_vaddr;
@@ -976,7 +976,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate high tx ring\n");
 		goto bail_host;
 	}
-	bzero(sc->sc_txhiring_dma.dma_vaddr, sizeof(struct txp_tx_desc) * TX_ENTRIES);
+	memset(sc->sc_txhiring_dma.dma_vaddr, 0, sizeof(struct txp_tx_desc) * TX_ENTRIES);
 	boot->br_txhipri_lo = htole32(sc->sc_txhiring_dma.dma_paddr & 0xffffffff);
 	boot->br_txhipri_hi = htole32(sc->sc_txhiring_dma.dma_paddr >> 32);
 	boot->br_txhipri_siz = htole32(TX_ENTRIES * sizeof(struct txp_tx_desc));
@@ -1003,7 +1003,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate low tx ring\n");
 		goto bail_txhiring;
 	}
-	bzero(sc->sc_txloring_dma.dma_vaddr, sizeof(struct txp_tx_desc) * TX_ENTRIES);
+	memset(sc->sc_txloring_dma.dma_vaddr, 0, sizeof(struct txp_tx_desc) * TX_ENTRIES);
 	boot->br_txlopri_lo = htole32(sc->sc_txloring_dma.dma_paddr & 0xffffffff);
 	boot->br_txlopri_hi = htole32(sc->sc_txloring_dma.dma_paddr >> 32);
 	boot->br_txlopri_siz = htole32(TX_ENTRIES * sizeof(struct txp_tx_desc));
@@ -1018,7 +1018,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate high rx ring\n");
 		goto bail_txloring;
 	}
-	bzero(sc->sc_rxhiring_dma.dma_vaddr, sizeof(struct txp_rx_desc) * RX_ENTRIES);
+	memset(sc->sc_rxhiring_dma.dma_vaddr, 0, sizeof(struct txp_rx_desc) * RX_ENTRIES);
 	boot->br_rxhipri_lo = htole32(sc->sc_rxhiring_dma.dma_paddr & 0xffffffff);
 	boot->br_rxhipri_hi = htole32(sc->sc_rxhiring_dma.dma_paddr >> 32);
 	boot->br_rxhipri_siz = htole32(RX_ENTRIES * sizeof(struct txp_rx_desc));
@@ -1035,7 +1035,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate low rx ring\n");
 		goto bail_rxhiring;
 	}
-	bzero(sc->sc_rxloring_dma.dma_vaddr, sizeof(struct txp_rx_desc) * RX_ENTRIES);
+	memset(sc->sc_rxloring_dma.dma_vaddr, 0, sizeof(struct txp_rx_desc) * RX_ENTRIES);
 	boot->br_rxlopri_lo = htole32(sc->sc_rxloring_dma.dma_paddr & 0xffffffff);
 	boot->br_rxlopri_hi = htole32(sc->sc_rxloring_dma.dma_paddr >> 32);
 	boot->br_rxlopri_siz = htole32(RX_ENTRIES * sizeof(struct txp_rx_desc));
@@ -1052,7 +1052,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate command ring\n");
 		goto bail_rxloring;
 	}
-	bzero(sc->sc_cmdring_dma.dma_vaddr, sizeof(struct txp_cmd_desc) * CMD_ENTRIES);
+	memset(sc->sc_cmdring_dma.dma_vaddr, 0, sizeof(struct txp_cmd_desc) * CMD_ENTRIES);
 	boot->br_cmd_lo = htole32(sc->sc_cmdring_dma.dma_paddr & 0xffffffff);
 	boot->br_cmd_hi = htole32(sc->sc_cmdring_dma.dma_paddr >> 32);
 	boot->br_cmd_siz = htole32(CMD_ENTRIES * sizeof(struct txp_cmd_desc));
@@ -1066,7 +1066,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate response ring\n");
 		goto bail_cmdring;
 	}
-	bzero(sc->sc_rspring_dma.dma_vaddr, sizeof(struct txp_rsp_desc) * RSP_ENTRIES);
+	memset(sc->sc_rspring_dma.dma_vaddr, 0, sizeof(struct txp_rsp_desc) * RSP_ENTRIES);
 	boot->br_resp_lo = htole32(sc->sc_rspring_dma.dma_paddr & 0xffffffff);
 	boot->br_resp_hi = htole32(sc->sc_rspring_dma.dma_paddr >> 32);
 	boot->br_resp_siz = htole32(CMD_ENTRIES * sizeof(struct txp_rsp_desc));
@@ -1080,7 +1080,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate rx buffer ring\n");
 		goto bail_rspring;
 	}
-	bzero(sc->sc_rxbufring_dma.dma_vaddr, sizeof(struct txp_rxbuf_desc) * RXBUF_ENTRIES);
+	memset(sc->sc_rxbufring_dma.dma_vaddr, 0, sizeof(struct txp_rxbuf_desc) * RXBUF_ENTRIES);
 	boot->br_rxbuf_lo = htole32(sc->sc_rxbufring_dma.dma_paddr & 0xffffffff);
 	boot->br_rxbuf_hi = htole32(sc->sc_rxbufring_dma.dma_paddr >> 32);
 	boot->br_rxbuf_siz = htole32(RXBUF_ENTRIES * sizeof(struct txp_rxbuf_desc));
@@ -1134,7 +1134,7 @@ txp_alloc_rings(sc)
 		printf(": can't allocate response ring\n");
 		goto bail_rxbufring;
 	}
-	bzero(sc->sc_zero_dma.dma_vaddr, sizeof(u_int32_t));
+	memset(sc->sc_zero_dma.dma_vaddr, 0, sizeof(u_int32_t));
 	boot->br_zero_lo = htole32(sc->sc_zero_dma.dma_paddr & 0xffffffff);
 	boot->br_zero_hi = htole32(sc->sc_zero_dma.dma_paddr >> 32);
 
@@ -1626,7 +1626,7 @@ txp_command2(sc, id, in1, in2, in3, in_e
 
 	idx = sc->sc_cmdring.lastwrite;
 	cmd = (struct txp_cmd_desc *)(((u_int8_t *)sc->sc_cmdring.base) + idx);
-	bzero(cmd, sizeof(*cmd));
+	memset(cmd, 0, sizeof(*cmd));
 
 	cmd->cmd_numdesc = in_extn;
 	seq = sc->sc_seq++;
Index: sys/dev/pci/piixpm.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/piixpm.c,v
retrieving revision 1.26
diff -u -p -r1.26 piixpm.c
--- sys/dev/pci/piixpm.c	12 Oct 2008 19:01:01 -0000	1.26
+++ sys/dev/pci/piixpm.c	19 Dec 2008 18:58:14 -0000
@@ -232,7 +232,7 @@ nopowermanagement:
 	sc->sc_i2c_tag.ic_release_bus = piixpm_i2c_release_bus;
 	sc->sc_i2c_tag.ic_exec = piixpm_i2c_exec;
 
-	bzero(&iba, sizeof(iba));
+	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c_tag;
 	config_found_ia(self, "i2cbus", &iba, iicbus_print);
 
Index: sys/dev/pci/ubsec.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/ubsec.c,v
retrieving revision 1.17
diff -u -p -r1.17 ubsec.c
--- sys/dev/pci/ubsec.c	19 Dec 2008 18:49:38 -0000	1.17
+++ sys/dev/pci/ubsec.c	19 Dec 2008 18:58:14 -0000
@@ -806,7 +806,7 @@ ubsec_newsession(void *arg, u_int32_t *s
 		}
 	}
 
-	bzero(ses, sizeof(struct ubsec_session));
+	memset(ses, 0, sizeof(struct ubsec_session));
 	ses->ses_used = 1;
 	if (encini) {
 		/* get an IV, network byte order */
@@ -901,7 +901,7 @@ ubsec_freesession(void *arg, u_int64_t t
 	if (session >= sc->sc_nsessions)
 		return (EINVAL);
 
-	bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session]));
+	memset(&sc->sc_sessions[session], 0, sizeof(sc->sc_sessions[session]));
 	return (0);
 }
 
@@ -967,8 +967,8 @@ ubsec_process(void *arg, struct cryptop 
 	splx(s);
 
 	dmap = q->q_dma; /* Save dma pointer */
-	bzero(q, sizeof(struct ubsec_q));
-	bzero(&ctx, sizeof(ctx));
+	memset(q, 0, sizeof(struct ubsec_q));
+	memset(&ctx, 0, sizeof(ctx));
 
 	q->q_sesn = UBSEC_SESSION(crp->crp_sid);
 	q->q_dma = dmap;
@@ -986,7 +986,7 @@ ubsec_process(void *arg, struct cryptop 
 		goto errout;	/* XXX we don't handle contiguous blocks! */
 	}
 
-	bzero(&dmap->d_dma->d_mcr, sizeof(struct ubsec_mcr));
+	memset(&dmap->d_dma->d_mcr, 0, sizeof(struct ubsec_mcr));
 
 	dmap->d_dma->d_mcr.mcr_pkts = htole16(1);
 	dmap->d_dma->d_mcr.mcr_flags = 0;
@@ -1691,10 +1691,10 @@ ubsec_callback2(struct ubsec_softc *sc, 
 		crypto_kdone(krp);
 
 		/* bzero all potentially sensitive data */
-		bzero(me->me_E.dma_vaddr, me->me_E.dma_size);
-		bzero(me->me_M.dma_vaddr, me->me_M.dma_size);
-		bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
-		bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size);
+		memset(me->me_E.dma_vaddr, 0, me->me_E.dma_size);
+		memset(me->me_M.dma_vaddr, 0, me->me_M.dma_size);
+		memset(me->me_C.dma_vaddr, 0, me->me_C.dma_size);
+		memset(me->me_q.q_ctx.dma_vaddr, 0, me->me_q.q_ctx.dma_size);
 
 		/* Can't free here, so put us on the free list. */
 		SIMPLEQ_INSERT_TAIL(&sc->sc_q2free, &me->me_q, q_next);
@@ -1716,9 +1716,9 @@ ubsec_callback2(struct ubsec_softc *sc, 
 
 		crypto_kdone(krp);
 
-		bzero(rp->rpr_msgin.dma_vaddr, rp->rpr_msgin.dma_size);
-		bzero(rp->rpr_msgout.dma_vaddr, rp->rpr_msgout.dma_size);
-		bzero(rp->rpr_q.q_ctx.dma_vaddr, rp->rpr_q.q_ctx.dma_size);
+		memset(rp->rpr_msgin.dma_vaddr, 0, rp->rpr_msgin.dma_size);
+		memset(rp->rpr_msgout.dma_vaddr, 0, rp->rpr_msgout.dma_size);
+		memset(rp->rpr_q.q_ctx.dma_vaddr, 0, rp->rpr_q.q_ctx.dma_size);
 
 		/* Can't free here, so put us on the free list. */
 		SIMPLEQ_INSERT_TAIL(&sc->sc_q2free, &rp->rpr_q, q_next);
@@ -2110,7 +2110,7 @@ ubsec_kprocess_modexp_sw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me, sizeof *me);
+	memset(me, 0, sizeof *me);
 	me->me_krp = krp;
 	me->me_q.q_type = UBS_CTXOP_MODEXP;
 
@@ -2172,7 +2172,7 @@ ubsec_kprocess_modexp_sw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
+	memset(me->me_C.dma_vaddr, 0, me->me_C.dma_size);
 
 	ebits = ubsec_ksigbits(&krp->krp_param[UBS_MODEXP_PAR_E]);
 	if (ebits > nbits) {
@@ -2229,7 +2229,7 @@ ubsec_kprocess_modexp_sw(struct ubsec_so
 #endif
 
 	ctx = (struct ubsec_ctx_modexp *)me->me_q.q_ctx.dma_vaddr;
-	bzero(ctx, sizeof(*ctx));
+	memset(ctx, 0, sizeof(*ctx));
 	ubsec_kshift_r(shiftbits,
 	    krp->krp_param[UBS_MODEXP_PAR_N].crp_p, nbits,
 	    ctx->me_N, normbits);
@@ -2272,19 +2272,19 @@ errout:
 		if (me->me_q.q_mcr.dma_map != NULL)
 			ubsec_dma_free(sc, &me->me_q.q_mcr);
 		if (me->me_q.q_ctx.dma_map != NULL) {
-			bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size);
+			memset(me->me_q.q_ctx.dma_vaddr, 0, me->me_q.q_ctx.dma_size);
 			ubsec_dma_free(sc, &me->me_q.q_ctx);
 		}
 		if (me->me_M.dma_map != NULL) {
-			bzero(me->me_M.dma_vaddr, me->me_M.dma_size);
+			memset(me->me_M.dma_vaddr, 0, me->me_M.dma_size);
 			ubsec_dma_free(sc, &me->me_M);
 		}
 		if (me->me_E.dma_map != NULL) {
-			bzero(me->me_E.dma_vaddr, me->me_E.dma_size);
+			memset(me->me_E.dma_vaddr, 0, me->me_E.dma_size);
 			ubsec_dma_free(sc, &me->me_E);
 		}
 		if (me->me_C.dma_map != NULL) {
-			bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
+			memset(me->me_C.dma_vaddr, 0, me->me_C.dma_size);
 			ubsec_dma_free(sc, &me->me_C);
 		}
 		if (me->me_epb.dma_map != NULL)
@@ -2315,7 +2315,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me, sizeof *me);
+	memset(me, 0, sizeof *me);
 	me->me_krp = krp;
 	me->me_q.q_type = UBS_CTXOP_MODEXP;
 
@@ -2370,7 +2370,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me->me_M.dma_vaddr, normbits / 8);
+	memset(me->me_M.dma_vaddr, 0, normbits / 8);
 	bcopy(krp->krp_param[UBS_MODEXP_PAR_M].crp_p,
 	    me->me_M.dma_vaddr, (mbits + 7) / 8);
 
@@ -2378,7 +2378,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
+	memset(me->me_C.dma_vaddr, 0, me->me_C.dma_size);
 
 	ebits = ubsec_ksigbits(&krp->krp_param[UBS_MODEXP_PAR_E]);
 	if (ebits > nbits) {
@@ -2389,7 +2389,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me->me_E.dma_vaddr, normbits / 8);
+	memset(me->me_E.dma_vaddr, 0, normbits / 8);
 	bcopy(krp->krp_param[UBS_MODEXP_PAR_E].crp_p,
 	    me->me_E.dma_vaddr, (ebits + 7) / 8);
 
@@ -2435,7 +2435,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
 #endif
 
 	ctx = (struct ubsec_ctx_modexp *)me->me_q.q_ctx.dma_vaddr;
-	bzero(ctx, sizeof(*ctx));
+	memset(ctx, 0, sizeof(*ctx));
 	bcopy(krp->krp_param[UBS_MODEXP_PAR_N].crp_p, ctx->me_N,
 	    (nbits + 7) / 8);
 	ctx->me_len = htole16((normbits / 8) + (4 * sizeof(u_int16_t)));
@@ -2476,19 +2476,19 @@ errout:
 		if (me->me_q.q_mcr.dma_map != NULL)
 			ubsec_dma_free(sc, &me->me_q.q_mcr);
 		if (me->me_q.q_ctx.dma_map != NULL) {
-			bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size);
+			memset(me->me_q.q_ctx.dma_vaddr, 0, me->me_q.q_ctx.dma_size);
 			ubsec_dma_free(sc, &me->me_q.q_ctx);
 		}
 		if (me->me_M.dma_map != NULL) {
-			bzero(me->me_M.dma_vaddr, me->me_M.dma_size);
+			memset(me->me_M.dma_vaddr, 0, me->me_M.dma_size);
 			ubsec_dma_free(sc, &me->me_M);
 		}
 		if (me->me_E.dma_map != NULL) {
-			bzero(me->me_E.dma_vaddr, me->me_E.dma_size);
+			memset(me->me_E.dma_vaddr, 0, me->me_E.dma_size);
 			ubsec_dma_free(sc, &me->me_E);
 		}
 		if (me->me_C.dma_map != NULL) {
-			bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
+			memset(me->me_C.dma_vaddr, 0, me->me_C.dma_size);
 			ubsec_dma_free(sc, &me->me_C);
 		}
 		if (me->me_epb.dma_map != NULL)
@@ -2564,7 +2564,7 @@ ubsec_kprocess_rsapriv(struct ubsec_soft
 		goto errout;
 	}
 	ctx = (struct ubsec_ctx_rsapriv *)rp->rpr_q.q_ctx.dma_vaddr;
-	bzero(ctx, sizeof *ctx);
+	memset(ctx, 0, sizeof *ctx);
 
 	/* Copy in p */
 	bcopy(krp->krp_param[UBS_RSAPRIV_PAR_P].crp_p,
@@ -2603,7 +2603,7 @@ ubsec_kprocess_rsapriv(struct ubsec_soft
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(rp->rpr_msgin.dma_vaddr, (msglen + 7) / 8);
+	memset(rp->rpr_msgin.dma_vaddr, 0, (msglen + 7) / 8);
 	bcopy(krp->krp_param[UBS_RSAPRIV_PAR_MSGIN].crp_p,
 	    rp->rpr_msgin.dma_vaddr,
 	    (krp->krp_param[UBS_RSAPRIV_PAR_MSGIN].crp_nbits + 7) / 8);
@@ -2618,7 +2618,7 @@ ubsec_kprocess_rsapriv(struct ubsec_soft
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(rp->rpr_msgout.dma_vaddr, (msglen + 7) / 8);
+	memset(rp->rpr_msgout.dma_vaddr, 0, (msglen + 7) / 8);
 
 	mcr->mcr_pkts = htole16(1);
 	mcr->mcr_flags = 0;
@@ -2672,11 +2672,11 @@ errout:
 		if (rp->rpr_q.q_mcr.dma_map != NULL)
 			ubsec_dma_free(sc, &rp->rpr_q.q_mcr);
 		if (rp->rpr_msgin.dma_map != NULL) {
-			bzero(rp->rpr_msgin.dma_vaddr, rp->rpr_msgin.dma_size);
+			memset(rp->rpr_msgin.dma_vaddr, 0, rp->rpr_msgin.dma_size);
 			ubsec_dma_free(sc, &rp->rpr_msgin);
 		}
 		if (rp->rpr_msgout.dma_map != NULL) {
-			bzero(rp->rpr_msgout.dma_vaddr, rp->rpr_msgout.dma_size);
+			memset(rp->rpr_msgout.dma_vaddr, 0, rp->rpr_msgout.dma_size);
 			ubsec_dma_free(sc, &rp->rpr_msgout);
 		}
 		free(rp, M_DEVBUF);
Index: sys/dev/pci/weasel_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/weasel_pci.c,v
retrieving revision 1.13
diff -u -p -r1.13 weasel_pci.c
--- sys/dev/pci/weasel_pci.c	9 Jul 2008 14:51:11 -0000	1.13
+++ sys/dev/pci/weasel_pci.c	19 Dec 2008 18:58:14 -0000
@@ -190,7 +190,7 @@ weasel_pci_attach(device_t parent, devic
 		if (v>7)
 			printf("%s: weird length for version string(%d).\n",
 			    device_xname(self), v);
-		bzero(buf, sizeof(buf));
+		memset(buf, 0, sizeof(buf));
 		for (cp = buf; v != 0; v--) {
 			if (weasel_wait_response(sc)) {
 				printf("%s: Weasel stopped providing version\n",
Index: sys/dev/pci/bktr/bktr_core.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/bktr/bktr_core.c,v
retrieving revision 1.49
diff -u -p -r1.49 bktr_core.c
--- sys/dev/pci/bktr/bktr_core.c	24 Apr 2008 15:35:28 -0000	1.49
+++ sys/dev/pci/bktr/bktr_core.c	19 Dec 2008 18:58:16 -0000
@@ -566,7 +566,7 @@ bktr_store_address(unit, BKTR_MEM_BUF,  
 	if (sbuf != 0) {
 		bktr->bigbuf = sbuf;
 		bktr->alloc_pages = BROOKTREE_ALLOC_PAGES;
-		bzero((void *) bktr->bigbuf, BROOKTREE_ALLOC);
+		memset((void *) bktr->bigbuf, 0, BROOKTREE_ALLOC);
 	} else {
 		bktr->alloc_pages = 0;
 	}
@@ -1092,8 +1092,8 @@ vbi_open(bktr_ptr_t bktr)
 	bktr->vbi_sequence_number = 0;
 	bktr->vbi_read_blocked = FALSE;
 
-	bzero((void *) bktr->vbibuffer, VBI_BUFFER_SIZE);
-	bzero((void *) bktr->vbidata,  VBI_DATA_SIZE);
+	memset((void *) bktr->vbibuffer, 0, VBI_BUFFER_SIZE);
+	memset((void *) bktr->vbidata, 0,  VBI_DATA_SIZE);
 
 	return(0);
 }
Index: sys/dev/pci/bktr/bktr_mem.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/bktr/bktr_mem.c,v
retrieving revision 1.4
diff -u -p -r1.4 bktr_mem.c
--- sys/dev/pci/bktr/bktr_mem.c	4 Mar 2007 06:02:27 -0000	1.4
+++ sys/dev/pci/bktr/bktr_mem.c	19 Dec 2008 18:58:16 -0000
@@ -79,7 +79,7 @@ bktr_mem_modevent(module_t mod, int type
 		printf("bktr_mem: memory holder loaded\n");
 /*
  * bzero causes a panic.
-		bzero((void *)memory_list, sizeof(memory_list));
+		memset((void *)memory_list, 0, sizeof(memory_list));
  * So use a simple for loop for now.
 */
 		{int x;
Index: sys/dev/pci/drm/ati_pcigart.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/ati_pcigart.c,v
retrieving revision 1.6
diff -u -p -r1.6 ati_pcigart.c
--- sys/dev/pci/drm/ati_pcigart.c	9 Nov 2008 14:26:14 -0000	1.6
+++ sys/dev/pci/drm/ati_pcigart.c	19 Dec 2008 18:58:16 -0000
@@ -71,7 +71,7 @@ int drm_ati_pcigart_init(drm_device_t *d
 	
 	pages = DRM_MIN(dev->sg->pages, gart_info->table_size / sizeof(u32));
 
-	bzero(pci_gart, gart_info->table_size);
+	memset(pci_gart, 0, gart_info->table_size);
 
 #ifdef __FreeBSD__
 	KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, ("page size too small"));
Index: sys/dev/pci/drm/i915_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/i915_drv.c,v
retrieving revision 1.8
diff -u -p -r1.8 i915_drv.c
--- sys/dev/pci/drm/i915_drv.c	8 Jul 2008 06:50:22 -0000	1.8
+++ sys/dev/pci/drm/i915_drv.c	19 Dec 2008 18:58:16 -0000
@@ -94,7 +94,7 @@ i915_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	i915_configure(dev);
 	return drm_attach(nbdev, i915_pciidlist);
 }
Index: sys/dev/pci/drm/mach64_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/mach64_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 mach64_drv.c
--- sys/dev/pci/drm/mach64_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/mach64_drv.c	19 Dec 2008 18:58:16 -0000
@@ -93,7 +93,7 @@ mach64_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	mach64_configure(dev);
 	return drm_attach(nbdev, mach64_pciidlist);
 }
Index: sys/dev/pci/drm/mga_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/mga_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 mga_drv.c
--- sys/dev/pci/drm/mga_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/mga_drv.c	19 Dec 2008 18:58:16 -0000
@@ -147,7 +147,7 @@ mga_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	mga_configure(dev);
 	return drm_attach(nbdev, mga_pciidlist);
 }
Index: sys/dev/pci/drm/r128_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/r128_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 r128_drv.c
--- sys/dev/pci/drm/r128_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/r128_drv.c	19 Dec 2008 18:58:16 -0000
@@ -93,7 +93,7 @@ r128_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	r128_configure(dev);
 	return drm_attach(nbdev, r128_pciidlist);
 }
Index: sys/dev/pci/drm/radeon_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/radeon_drv.c,v
retrieving revision 1.9
diff -u -p -r1.9 radeon_drv.c
--- sys/dev/pci/drm/radeon_drv.c	8 Jul 2008 06:50:23 -0000	1.9
+++ sys/dev/pci/drm/radeon_drv.c	19 Dec 2008 18:58:16 -0000
@@ -102,7 +102,7 @@ radeon_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	radeon_configure(dev);
 	return drm_attach(nbdev, radeon_pciidlist);
 }
Index: sys/dev/pci/drm/savage_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/savage_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 savage_drv.c
--- sys/dev/pci/drm/savage_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/savage_drv.c	19 Dec 2008 18:58:16 -0000
@@ -83,7 +83,7 @@ savage_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	savage_configure(dev);
 	return drm_attach(nbdev, savage_pciidlist);
 }
Index: sys/dev/pci/drm/sis_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/sis_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 sis_drv.c
--- sys/dev/pci/drm/sis_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/sis_drv.c	19 Dec 2008 18:58:16 -0000
@@ -76,7 +76,7 @@ sis_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	sis_configure(dev);
 	return drm_attach(nbdev, sis_pciidlist);
 }
Index: sys/dev/pci/drm/tdfx_drv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/drm/tdfx_drv.c,v
retrieving revision 1.5
diff -u -p -r1.5 tdfx_drv.c
--- sys/dev/pci/drm/tdfx_drv.c	8 Jul 2008 06:50:23 -0000	1.5
+++ sys/dev/pci/drm/tdfx_drv.c	19 Dec 2008 18:58:16 -0000
@@ -77,7 +77,7 @@ tdfx_attach(device_t nbdev)
 {
 	drm_device_t *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(drm_device_t));
+	memset(dev, 0, sizeof(drm_device_t));
 	tdfx_configure(dev);
 	return drm_attach(nbdev, tdfx_pciidlist);
 }
Index: sys/dev/pci/n8/nsp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/n8/nsp.c,v
retrieving revision 1.2
diff -u -p -r1.2 nsp.c
--- sys/dev/pci/n8/nsp.c	12 Nov 2008 12:36:16 -0000	1.2
+++ sys/dev/pci/n8/nsp.c	19 Dec 2008 18:58:17 -0000
@@ -416,7 +416,7 @@ nsp_attach(struct device *parent, struct
 
 	/* setup card */
 
-	bzero(nip, sizeof (*nip));
+	memset(nip, 0, sizeof (*nip));
 
 	sc->nip = nip;
 	nip->dev = sc;
Index: sys/dev/qbus/if_qe.c
===================================================================
RCS file: /cvsroot/src/sys/dev/qbus/if_qe.c,v
retrieving revision 1.68
diff -u -p -r1.68 if_qe.c
--- sys/dev/qbus/if_qe.c	7 Nov 2008 00:20:12 -0000	1.68
+++ sys/dev/qbus/if_qe.c	19 Dec 2008 18:58:17 -0000
@@ -148,7 +148,7 @@ qematch(device_t parent, cfdata_t cf, vo
 	int error;
 
 	ring = malloc(PROBESIZE, M_TEMP, M_WAITOK|M_ZERO);
-	bzero(sc, sizeof(*sc));
+	memset(sc, 0, sizeof(*sc));
 	sc->sc_iot = ua->ua_iot;
 	sc->sc_ioh = ua->ua_ioh;
 	sc->sc_dmat = ua->ua_dmat;
@@ -240,7 +240,7 @@ qeattach(device_t parent, device_t self,
 	/*
 	 * Zero the newly allocated memory.
 	 */
-	bzero(sc->sc_qedata, sizeof(struct qe_cdata) + ETHER_PAD_LEN);
+	memset(sc->sc_qedata, 0, sizeof(struct qe_cdata) + ETHER_PAD_LEN);
 	nullbuf = ((char*)sc->sc_qedata) + sizeof(struct qe_cdata);
 	/*
 	 * Create the transmit descriptor DMA maps. We take advantage
Index: sys/dev/qbus/uda.c
===================================================================
RCS file: /cvsroot/src/sys/dev/qbus/uda.c,v
retrieving revision 1.58
diff -u -p -r1.58 uda.c
--- sys/dev/qbus/uda.c	11 Mar 2008 05:34:02 -0000	1.58
+++ sys/dev/qbus/uda.c	19 Dec 2008 18:58:17 -0000
@@ -239,7 +239,7 @@ udaattach(device_t parent, device_t self
 	if ((error = ubmemalloc(sc->sc_uh, &sc->sc_ui, UBA_CANTWAIT)))
 		return printf("ubmemalloc failed: %d\n", error);
 
-	bzero(sc->sc_ui.ui_vaddr, sizeof (struct mscp_pack));
+	memset(sc->sc_ui.ui_vaddr, 0, sizeof (struct mscp_pack));
 
 	/*
 	 * The only thing that differ UDA's and Tape ctlr's is
Index: sys/dev/rcons/raster_op.c
===================================================================
RCS file: /cvsroot/src/sys/dev/rcons/raster_op.c,v
retrieving revision 1.15
diff -u -p -r1.15 raster_op.c
--- sys/dev/rcons/raster_op.c	11 Dec 2005 12:23:44 -0000	1.15
+++ sys/dev/rcons/raster_op.c	19 Dec 2008 18:58:17 -0000
@@ -1117,7 +1117,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, 
 	/* Special-case full-width clears. */
 	if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 5 )
 	    {
-	    bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+	    memset( (char*) dstlin1, 0, h * dst->linelongs * sizeof(u_int32_t) );
 	    return 0;
 	    }
 #endif /*BCOPY_FASTER*/
@@ -1213,7 +1213,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, 
 	/* Special-case full-width clears. */
 	if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 4 )
 	    {
-	    bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+	    memset( (char*) dstlin1, 0, h * dst->linelongs * sizeof(u_int32_t) );
 	    return 0;
 	    }
 #endif /*BCOPY_FASTER*/
@@ -1320,7 +1320,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, 
 	/* Special-case full-width clears. */
 	if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 3 )
 	    {
-	    bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+	    memset( (char*) dstlin1, 0, h * dst->linelongs * sizeof(u_int32_t) );
 	    return 0;
 	    }
 #endif /*BCOPY_FASTER*/
@@ -1425,7 +1425,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, 
 	/* Special-case full-width clears. */
 	if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 2 )
 	    {
-	    bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+	    memset( (char*) dstlin1, 0, h * dst->linelongs * sizeof(u_int32_t) );
 	    return 0;
 	    }
 #endif /*BCOPY_FASTER*/
@@ -1530,7 +1530,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, 
 	/* Special-case full-width clears. */
 	if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 1 )
 	    {
-	    bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+	    memset( (char*) dstlin1, 0, h * dst->linelongs * sizeof(u_int32_t) );
 	    return 0;
 	    }
 #endif /*BCOPY_FASTER*/
Index: sys/dev/sbus/xbox.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sbus/xbox.c,v
retrieving revision 1.15
diff -u -p -r1.15 xbox.c
--- sys/dev/sbus/xbox.c	28 Apr 2008 20:23:57 -0000	1.15
+++ sys/dev/sbus/xbox.c	19 Dec 2008 18:58:17 -0000
@@ -152,7 +152,7 @@ xbox_attach(parent, self, aux)
 	/*
 	 * Now pretend to be another Sbus.
 	 */
-	bzero(&xa, sizeof xa);
+	memset(&xa, 0, sizeof xa);
 	xa.xa_name = "sbus";
 	xa.xa_node = node;
 	xa.xa_bustag = sa->sa_bustag;
Index: sys/dev/scsipi/cd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/cd.c,v
retrieving revision 1.283
diff -u -p -r1.283 cd.c
--- sys/dev/scsipi/cd.c	5 Sep 2008 22:25:39 -0000	1.283
+++ sys/dev/scsipi/cd.c	19 Dec 2008 18:58:18 -0000
@@ -2861,7 +2861,7 @@ mmc_getdiscinfo_cdrom(struct scsipi_peri
 
 	/* get number of sessions and first tracknr in last session */
 	flags = XS_CTL_DATA_IN | XS_CTL_DATA_ONSTACK;
-	bzero(&gtoc_cmd, sizeof(gtoc_cmd));
+	memset(&gtoc_cmd, 0, sizeof(gtoc_cmd));
 	gtoc_cmd.opcode      = READ_TOC;
 	gtoc_cmd.addr_mode   = CD_MSF;		/* not relevant        */
 	gtoc_cmd.resp_format = CD_TOC_MSINFO;	/* multisession info   */
@@ -2926,7 +2926,7 @@ mmc_getdiscinfo_dvdrom(struct scsipi_per
 
 	/* get number of sessions and first tracknr in last session */
 	flags = XS_CTL_DATA_IN | XS_CTL_DATA_ONSTACK;
-	bzero(&gtoc_cmd, sizeof(gtoc_cmd));
+	memset(&gtoc_cmd, 0, sizeof(gtoc_cmd));
 	gtoc_cmd.opcode      = READ_TOC;
 	gtoc_cmd.addr_mode   = 0;		/* LBA                 */
 	gtoc_cmd.resp_format = CD_TOC_FORM;	/* multisession info   */
@@ -3188,7 +3188,7 @@ mmc_gettrackinfo_cdrom(struct scsipi_per
 
 	/* get raw toc to process, first header to check size */
 	flags = XS_CTL_DATA_IN | XS_CTL_DATA_ONSTACK | XS_CTL_SILENT;
-	bzero(&gtoc_cmd, sizeof(gtoc_cmd));
+	memset(&gtoc_cmd, 0, sizeof(gtoc_cmd));
 	gtoc_cmd.opcode      = READ_TOC;
 	gtoc_cmd.addr_mode   = CD_MSF;		/* not relevant     */
 	gtoc_cmd.resp_format = CD_TOC_RAW;	/* raw toc          */
@@ -3359,7 +3359,7 @@ mmc_gettrackinfo_dvdrom(struct scsipi_pe
 
 	/* get formatted toc to process, first header to check size */
 	flags = XS_CTL_DATA_IN | XS_CTL_DATA_ONSTACK | XS_CTL_SILENT;
-	bzero(&gtoc_cmd, sizeof(gtoc_cmd));
+	memset(&gtoc_cmd, 0, sizeof(gtoc_cmd));
 	gtoc_cmd.opcode      = READ_TOC;
 	gtoc_cmd.addr_mode   = 0;		/* lba's please     */
 	gtoc_cmd.resp_format = CD_TOC_FORM;	/* formatted toc    */
Index: sys/dev/sun/fb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sun/fb.c,v
retrieving revision 1.28
diff -u -p -r1.28 fb.c
--- sys/dev/sun/fb.c	5 Apr 2008 16:46:15 -0000	1.28
+++ sys/dev/sun/fb.c	19 Dec 2008 18:58:18 -0000
@@ -423,7 +423,7 @@ fbrcons_init(fb)
 #endif
 
 	/* Set up what rasops needs to know about */
-	bzero(ri, sizeof *ri);
+	memset(ri, 0, sizeof *ri);
 	ri->ri_stride = fb->fb_linebytes;
 	ri->ri_bits = (void *)fb->fb_pixels;
 	ri->ri_depth = fb->fb_type.fb_depth;
Index: sys/dev/tc/if_le_ioasic.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/if_le_ioasic.c,v
retrieving revision 1.30
diff -u -p -r1.30 if_le_ioasic.c
--- sys/dev/tc/if_le_ioasic.c	4 Apr 2008 12:25:07 -0000	1.30
+++ sys/dev/tc/if_le_ioasic.c	19 Dec 2008 18:58:18 -0000
@@ -413,7 +413,7 @@ le_ioasic_zerobuf_gap16(struct lance_sof
 	boff &= 0xf;
 	xfer = min(len, 16 - boff);
 	while (len > 0) {
-		bzero(bptr + boff, xfer);
+		memset(bptr + boff, 0, xfer);
 		bptr += 32;
 		boff = 0;
 		len -= xfer;
Index: sys/dev/tc/tcds.c
===================================================================
RCS file: /cvsroot/src/sys/dev/tc/tcds.c,v
retrieving revision 1.23
diff -u -p -r1.23 tcds.c
--- sys/dev/tc/tcds.c	9 Jul 2008 13:19:33 -0000	1.23
+++ sys/dev/tc/tcds.c	19 Dec 2008 18:58:18 -0000
@@ -222,7 +222,7 @@ tcdsattach(device_t parent, device_t sel
 		char *cp;
 
 		slotc = &sc->sc_slots[i];
-		bzero(slotc, sizeof *slotc);	/* clear everything */
+		memset(slotc, 0, sizeof *slotc);	/* clear everything */
 
 		cp = slotc->sc_name;
 		snprintf(cp, sizeof(slotc->sc_name), "chip %d", i);
Index: sys/dev/usb/if_atu.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_atu.c,v
retrieving revision 1.29
diff -u -p -r1.29 if_atu.c
--- sys/dev/usb/if_atu.c	24 May 2008 16:40:58 -0000	1.29
+++ sys/dev/usb/if_atu.c	19 Dec 2008 18:58:18 -0000
@@ -1336,7 +1336,7 @@ atu_complete_attach(struct atu_softc *sc
 	sc->atu_wepkeylen = ATU_WEP_104BITS;
 	sc->atu_wepkey = 0;
 
-	bzero(sc->atu_bssid, ETHER_ADDR_LEN);
+	memset(sc->atu_bssid, 0, ETHER_ADDR_LEN);
 	sc->atu_channel = ATU_DEFAULT_CHANNEL;
 	sc->atu_desired_channel = IEEE80211_CHAN_ANY;
 	sc->atu_mode = INFRASTRUCTURE_MODE;
Index: sys/dev/usb/if_rum.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_rum.c,v
retrieving revision 1.24
diff -u -p -r1.24 if_rum.c
--- sys/dev/usb/if_rum.c	7 Nov 2008 00:20:12 -0000	1.24
+++ sys/dev/usb/if_rum.c	19 Dec 2008 18:58:18 -0000
@@ -552,7 +552,7 @@ rum_alloc_tx_list(struct rum_softc *sc)
 		}
 
 		/* clean Tx descriptor */
-		bzero(data->buf, RT2573_TX_DESC_SIZE);
+		memset(data->buf, 0, RT2573_TX_DESC_SIZE);
 	}
 
 	return 0;
Index: sys/dev/usb/if_zyd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_zyd.c,v
retrieving revision 1.15
diff -u -p -r1.15 if_zyd.c
--- sys/dev/usb/if_zyd.c	7 Nov 2008 00:20:13 -0000	1.15
+++ sys/dev/usb/if_zyd.c	19 Dec 2008 18:58:19 -0000
@@ -593,7 +593,7 @@ zyd_alloc_tx_list(struct zyd_softc *sc)
 		}
 
 		/* clear Tx descriptor */
-		bzero(data->buf, sizeof (struct zyd_tx_desc));
+		memset(data->buf, 0, sizeof (struct zyd_tx_desc));
 	}
 	return 0;
 
Index: sys/dev/vme/xd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/vme/xd.c,v
retrieving revision 1.76
diff -u -p -r1.76 xd.c
--- sys/dev/vme/xd.c	11 Jun 2008 21:25:31 -0000	1.76
+++ sys/dev/vme/xd.c	19 Dec 2008 18:58:20 -0000
@@ -592,7 +592,7 @@ xdcattach(parent, self, aux)
 	}
 	xdc->dvmaiopb = (struct xd_iopb *)(u_long)BUS_ADDR_PADDR(busaddr);
 
-	bzero(xdc->iopbase, XDC_MAXIOPB * sizeof(struct xd_iopb));
+	memset(xdc->iopbase, 0, XDC_MAXIOPB * sizeof(struct xd_iopb));
 
 	xdc->reqs = (struct xd_iorq *)
 	    malloc(XDC_MAXIOPB * sizeof(struct xd_iorq),
@@ -743,7 +743,7 @@ xdattach(parent, self, aux)
 	 * Always re-initialize the disk structure.  We want statistics
 	 * to start with a clean slate.
 	 */
-	bzero(&xd->sc_dk, sizeof(xd->sc_dk));
+	memset(&xd->sc_dk, 0, sizeof(xd->sc_dk));
 
 	/* if booting, init the xd_softc */
 
@@ -1898,7 +1898,7 @@ xdc_xdreset(xdcsc, xdsc)
 	u_long  addr;
 	int     del;
 	bcopy(xdcsc->iopbase, &tmpiopb, sizeof(tmpiopb));
-	bzero(xdcsc->iopbase, sizeof(tmpiopb));
+	memset(xdcsc->iopbase, 0, sizeof(tmpiopb));
 	xdcsc->iopbase->comm = XDCMD_RST;
 	xdcsc->iopbase->unit = xdsc->xd_drive;
 	addr = (u_long) xdcsc->dvmaiopb;
@@ -2346,7 +2346,7 @@ xdc_tick(arg)
 		printf("%s: diag: IOPB miscount (got w/f/r/d %d/%d/%d/%d, wanted %d)\n",
 		    device_xname(&xdcsc->sc_dev), nwait, nfree, nrun, ndone,
 		    XDC_MAXIOPB);
-		bzero(mark, sizeof(mark));
+		memset(mark, 0, sizeof(mark));
 		printf("FREE: ");
 		for (lcv = nfree; lcv > 0; lcv--) {
 			printf("%d ", fqc[lcv - 1]);
Index: sys/dev/vme/xy.c
===================================================================
RCS file: /cvsroot/src/sys/dev/vme/xy.c,v
retrieving revision 1.81
diff -u -p -r1.81 xy.c
--- sys/dev/vme/xy.c	11 Jun 2008 21:25:31 -0000	1.81
+++ sys/dev/vme/xy.c	19 Dec 2008 18:58:20 -0000
@@ -497,7 +497,7 @@ xycattach(parent, self, aux)
 	}
 	xyc->dvmaiopb = (struct xy_iopb *)(u_long)BUS_ADDR_PADDR(busaddr);
 
-	bzero(xyc->iopbase, XYC_MAXIOPB * sizeof(struct xy_iopb));
+	memset(xyc->iopbase, 0, XYC_MAXIOPB * sizeof(struct xy_iopb));
 
 	xyc->reqs = (struct xy_iorq *)
 	    malloc(XYC_MAXIOPB * sizeof(struct xy_iorq),
@@ -640,7 +640,7 @@ xyattach(parent, self, aux)
 	 * Always re-initialize the disk structure.  We want statistics
 	 * to start with a clean slate.
 	 */
-	bzero(&xy->sc_dk, sizeof(xy->sc_dk));
+	memset(&xy->sc_dk, 0, sizeof(xy->sc_dk));
 
 	/* if booting, init the xy_softc */
 
@@ -1658,7 +1658,7 @@ xyc_chain(xycsc, iorq)
 {
 	int togo, chain, hand;
 
-	bzero(xycsc->xy_chain, sizeof(xycsc->xy_chain));
+	memset(xycsc->xy_chain, 0, sizeof(xycsc->xy_chain));
 
 	/*
 	 * promote control IOPB to the top
Index: sys/dist/ipf/netinet/fil.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/fil.c,v
retrieving revision 1.43
diff -u -p -r1.43 fil.c
--- sys/dist/ipf/netinet/fil.c	20 May 2008 07:08:07 -0000	1.43
+++ sys/dist/ipf/netinet/fil.c	19 Dec 2008 18:58:21 -0000
@@ -2430,7 +2430,7 @@ int out;
 		return 0;
 	}
 
-	bzero((char *)fin, sizeof(*fin));
+	memset((char *)fin, 0, sizeof(*fin));
 
 # ifdef MENTAT
 	if (qpi->qpi_flags & QF_GROUP)
@@ -2473,7 +2473,7 @@ int out;
 #  endif /* CSUM_DELAY_DATA */
 # endif /* MENTAT */
 #else
-	bzero((char *)fin, sizeof(*fin));
+	memset((char *)fin, 0, sizeof(*fin));
 	m = *mp;
 #endif /* _KERNEL */
 
@@ -3558,7 +3558,7 @@ int proto, flags;
 	int flushed = 0, set;
 
 	WRITE_ENTER(&ipf_mutex);
-	bzero((char *)frcache, sizeof(frcache));
+	memset((char *)frcache, 0, sizeof(frcache));
 
 	set = fr_active;
 	if ((flags & FR_INACTIVE) == FR_INACTIVE)
@@ -4462,7 +4462,7 @@ void *data;
 		}
 		fprev = ftail;
 	}
-	bzero((char *)frcache, sizeof(frcache));
+	memset((char *)frcache, 0, sizeof(frcache));
 
 	for (; (f = *ftail) != NULL; ftail = &f->fr_next) {
 		if ((fp->fr_cksum != f->fr_cksum) ||
@@ -6397,7 +6397,7 @@ int fr_initialise()
 {
 	int i;
 
-	bzero(&frstats, sizeof(frstats));
+	memset(&frstats, 0, sizeof(frstats));
 
 #ifdef IPFILTER_LOG
 	i = fr_loginit();
@@ -6507,7 +6507,7 @@ void	*data;
 		return EFAULT;
 
 	WRITE_ENTER(&ipf_mutex);
-	bzero(&frstats, sizeof(frstats));
+	memset(&frstats, 0, sizeof(frstats));
 	RWLOCK_EXIT(&ipf_mutex);
 
 	return 0;
@@ -6877,7 +6877,7 @@ int ipf_getnextrule(ipftoken_t *t, void 
 				t->ipt_data = next;
 			}
 		} else {
-			bzero(&zero, sizeof(zero));
+			memset(&zero, 0, sizeof(zero));
 			next = &zero;
 			count = 1;
 			t->ipt_data = NULL;
@@ -7116,7 +7116,7 @@ void *ctx;
 			error = EPERM;
 		else {
 			WRITE_ENTER(&ipf_mutex);
-			bzero((char *)frcache, sizeof(frcache[0]) * 2);
+			memset((char *)frcache, 0, sizeof(frcache[0]) * 2);
 			error = BCOPYOUT(&fr_active, data, sizeof(fr_active));
 			if (error != 0)
 				error = EFAULT;
Index: sys/dist/ipf/netinet/ip_auth.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_auth.c,v
retrieving revision 1.12
diff -u -p -r1.12 ip_auth.c
--- sys/dist/ipf/netinet/ip_auth.c	20 May 2008 07:08:07 -0000	1.12
+++ sys/dist/ipf/netinet/ip_auth.c	19 Dec 2008 18:58:21 -0000
@@ -168,13 +168,13 @@ int fr_authinit()
 {
 	KMALLOCS(fr_auth, frauth_t *, fr_authsize * sizeof(*fr_auth));
 	if (fr_auth != NULL)
-		bzero((char *)fr_auth, fr_authsize * sizeof(*fr_auth));
+		memset((char *)fr_auth, 0, fr_authsize * sizeof(*fr_auth));
 	else
 		return -1;
 
 	KMALLOCS(fr_authpkts, mb_t **, fr_authsize * sizeof(*fr_authpkts));
 	if (fr_authpkts != NULL)
-		bzero((char *)fr_authpkts, fr_authsize * sizeof(*fr_authpkts));
+		memset((char *)fr_authpkts, 0, fr_authsize * sizeof(*fr_authpkts));
 	else
 		return -2;
 
@@ -783,7 +783,7 @@ ipfgeniter_t *itp;
 			token->ipt_data = next;
 		}
 	} else {
-		bzero(&zero, sizeof(zero));
+		memset(&zero, 0, sizeof(zero));
 		next = &zero;
 	}
 	RWLOCK_EXIT(&ipf_auth);
Index: sys/dist/ipf/netinet/ip_fil_netbsd.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_fil_netbsd.c,v
retrieving revision 1.47
diff -u -p -r1.47 ip_fil_netbsd.c
--- sys/dist/ipf/netinet/ip_fil_netbsd.c	6 Nov 2008 09:49:59 -0000	1.47
+++ sys/dist/ipf/netinet/ip_fil_netbsd.c	19 Dec 2008 18:58:21 -0000
@@ -428,9 +428,9 @@ int ipfattach(void)
 	for (i = 0; i < IPL_LOGSIZE; i++)
 		selinit(&ipfselwait[i]);
 #else
-	bzero((char *)ipfselwait, sizeof(ipfselwait));
+	memset((char *)ipfselwait, 0, sizeof(ipfselwait));
 #endif
-	bzero((char *)frcache, sizeof(frcache));
+	memset((char *)frcache, 0, sizeof(frcache));
 	fr_savep = fr_checkp;
 	fr_checkp = fr_check;
 
@@ -847,11 +847,11 @@ fr_info_t *fin;
 	m->m_pkthdr.len = m->m_len;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
 	ip = mtod(m, struct ip *);
-	bzero((char *)ip, hlen);
+	memset((char *)ip, 0, hlen);
 #ifdef USE_INET6
 	ip6 = (ip6_t *)ip;
 #endif
-	bzero((char *)ip, sizeof(*tcp2) + hlen);
+	memset((char *)ip, 0, sizeof(*tcp2) + hlen);
 	tcp2 = (struct tcphdr *)((char *)ip + hlen);
 	tcp2->th_sport = tcp->th_dport;
 	tcp2->th_dport = tcp->th_sport;
@@ -912,7 +912,7 @@ mb_t *m, **mpp;
 	int hlen;
 
 	ip = mtod(m, ip_t *);
-	bzero((char *)&fnew, sizeof(fnew));
+	memset((char *)&fnew, 0, sizeof(fnew));
 
 	IP_V_A(ip, fin->fin_v);
 	switch (fin->fin_v)
@@ -1654,7 +1654,7 @@ struct in_addr *inp, *inpmask;
 		inp->s_addr = 0;
 #ifdef USE_INET6
 	else if (v == 6)
-		bzero((char *)inp, sizeof(struct in6_addr));
+		memset((char *)inp, 0, sizeof(struct in6_addr));
 #endif
 
 	ifa = IFADDR_FIRST(ifp);
Index: sys/dist/ipf/netinet/ip_frag.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_frag.c,v
retrieving revision 1.9
diff -u -p -r1.9 ip_frag.c
--- sys/dist/ipf/netinet/ip_frag.c	20 May 2008 07:08:07 -0000	1.9
+++ sys/dist/ipf/netinet/ip_frag.c	19 Dec 2008 18:58:21 -0000
@@ -152,17 +152,17 @@ int fr_fraginit()
 	KMALLOCS(ipfr_heads, ipfr_t **, ipfr_size * sizeof(ipfr_t *));
 	if (ipfr_heads == NULL)
 		return -1;
-	bzero((char *)ipfr_heads, ipfr_size * sizeof(ipfr_t *));
+	memset((char *)ipfr_heads, 0, ipfr_size * sizeof(ipfr_t *));
 
 	KMALLOCS(ipfr_nattab, ipfr_t **, ipfr_size * sizeof(ipfr_t *));
 	if (ipfr_nattab == NULL)
 		return -1;
-	bzero((char *)ipfr_nattab, ipfr_size * sizeof(ipfr_t *));
+	memset((char *)ipfr_nattab, 0, ipfr_size * sizeof(ipfr_t *));
 
 	KMALLOCS(ipfr_ipidtab, ipfr_t **, ipfr_size * sizeof(ipfr_t *));
 	if (ipfr_ipidtab == NULL)
 		return -1;
-	bzero((char *)ipfr_ipidtab, ipfr_size * sizeof(ipfr_t *));
+	memset((char *)ipfr_ipidtab, 0, ipfr_size * sizeof(ipfr_t *));
 
 	RWLOCK_INIT(&ipf_frag, "ipf fragment rwlock");
 	fr_frag_init = 1;
@@ -941,7 +941,7 @@ ipfrwlock_t *lock;
 		ATOMIC_INC(next->ipfr_ref);
 		token->ipt_data = next;
 	} else {
-		bzero(&zero, sizeof(zero));
+		memset(&zero, 0, sizeof(zero));
 		next = &zero;
 		token->ipt_data = NULL;
 	}
Index: sys/dist/ipf/netinet/ip_ftp_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_ftp_pxy.c,v
retrieving revision 1.14
diff -u -p -r1.14 ip_ftp_pxy.c
--- sys/dist/ipf/netinet/ip_ftp_pxy.c	11 Dec 2007 04:55:00 -0000	1.14
+++ sys/dist/ipf/netinet/ip_ftp_pxy.c	19 Dec 2008 18:58:21 -0000
@@ -101,7 +101,7 @@ static	ipftuneable_t	ftptune = {
  */
 int ippr_ftp_init()
 {
-	bzero((char *)&ftppxyfr, sizeof(ftppxyfr));
+	memset((char *)&ftppxyfr, 0, sizeof(ftppxyfr));
 	ftppxyfr.fr_ref = 1;
 	ftppxyfr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&ftppxyfr.fr_lock, "FTP Proxy Mutex");
@@ -141,7 +141,7 @@ nat_t *nat;
 	aps->aps_data = ftp;
 	aps->aps_psiz = sizeof(ftpinfo_t);
 
-	bzero((char *)ftp, sizeof(*ftp));
+	memset((char *)ftp, 0, sizeof(*ftp));
 	f = &ftp->ftp_side[0];
 	f->ftps_rptr = f->ftps_buf;
 	f->ftps_wptr = f->ftps_buf;
@@ -335,7 +335,7 @@ int dlen;
 
 		slen = ip->ip_len;
 		ip->ip_len = fin->fin_hlen + sizeof(*tcp2);
-		bzero((char *)tcp2, sizeof(*tcp2));
+		memset((char *)tcp2, 0, sizeof(*tcp2));
 		tcp2->th_win = htons(8192);
 		tcp2->th_sport = htons(sp);
 		TCP_OFF_A(tcp2, 5);
@@ -679,7 +679,7 @@ u_int data_ip;
 
 		slen = ip->ip_len;
 		ip->ip_len = fin->fin_hlen + sizeof(*tcp2);
-		bzero((char *)tcp2, sizeof(*tcp2));
+		memset((char *)tcp2, 0, sizeof(*tcp2));
 		tcp2->th_win = htons(8192);
 		tcp2->th_sport = 0;		/* XXX - fake it for nat_new */
 		TCP_OFF_A(tcp2, 5);
Index: sys/dist/ipf/netinet/ip_h323_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_h323_pxy.c,v
retrieving revision 1.10
diff -u -p -r1.10 ip_h323_pxy.c
--- sys/dist/ipf/netinet/ip_h323_pxy.c	20 May 2008 07:08:07 -0000	1.10
+++ sys/dist/ipf/netinet/ip_h323_pxy.c	19 Dec 2008 18:58:21 -0000
@@ -92,7 +92,7 @@ unsigned short *port;
  */
 int ippr_h323_init()
 {
-	bzero((char *)&h323_fr, sizeof(h323_fr));
+	memset((char *)&h323_fr, 0, sizeof(h323_fr));
 	h323_fr.fr_ref = 1;
 	h323_fr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&h323_fr.fr_lock, "H323 proxy rule lock");
@@ -272,7 +272,7 @@ nat_t *nat;
 			newip.ip_p = IPPROTO_UDP;
 			newip.ip_src = nat->nat_inip;
 
-			bzero((char *)&udp, sizeof(udp));
+			memset((char *)&udp, 0, sizeof(udp));
 			udp.uh_sport = port;
 
 			memcpy(&fi, fin, sizeof(fi));
Index: sys/dist/ipf/netinet/ip_htable.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_htable.c,v
retrieving revision 1.9
diff -u -p -r1.9 ip_htable.c
--- sys/dist/ipf/netinet/ip_htable.c	20 May 2008 07:08:07 -0000	1.9
+++ sys/dist/ipf/netinet/ip_htable.c	19 Dec 2008 18:58:22 -0000
@@ -169,7 +169,7 @@ iplookupop_t *op;
 		return ENOMEM;
 	}
 
-	bzero((char *)iph->iph_table, iph->iph_size * sizeof(*iph->iph_table));
+	memset((char *)iph->iph_table, 0, iph->iph_size * sizeof(*iph->iph_table));
 	iph->iph_masks = 0;
 	iph->iph_list = NULL;
 
@@ -553,7 +553,7 @@ ipflookupiter_t *ilp;
 			ATOMIC_INC(nextiph->iph_ref);
 			token->ipt_data = nextiph;
 		} else {
-			bzero((char *)&zp, sizeof(zp));
+			memset((char *)&zp, 0, sizeof(zp));
 			nextiph = &zp;
 			token->ipt_data = NULL;
 		}
@@ -576,7 +576,7 @@ ipflookupiter_t *ilp;
 			ATOMIC_INC(nextnode->ipe_ref);
 			token->ipt_data = nextnode;
 		} else {
-			bzero((char *)&zn, sizeof(zn));
+			memset((char *)&zn, 0, sizeof(zn));
 			nextnode = &zn;
 			token->ipt_data = NULL;
 		}
Index: sys/dist/ipf/netinet/ip_ipsec_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_ipsec_pxy.c,v
retrieving revision 1.7
diff -u -p -r1.7 ip_ipsec_pxy.c
--- sys/dist/ipf/netinet/ip_ipsec_pxy.c	11 Dec 2007 04:55:01 -0000	1.7
+++ sys/dist/ipf/netinet/ip_ipsec_pxy.c	19 Dec 2008 18:58:22 -0000
@@ -38,7 +38,7 @@ int	ipsec_proxy_ttl = 60;
  */
 int ippr_ipsec_init()
 {
-	bzero((char *)&ipsecfr, sizeof(ipsecfr));
+	memset((char *)&ipsecfr, 0, sizeof(ipsecfr));
 	ipsecfr.fr_ref = 1;
 	ipsecfr.fr_flags = FR_OUTQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&ipsecfr.fr_lock, "IPsec proxy rule lock");
@@ -101,7 +101,7 @@ nat_t *nat;
 	ip_t *ip;
 
 	off = fin->fin_plen - fin->fin_dlen + fin->fin_ipoff;
-	bzero(ipsec_buffer, sizeof(ipsec_buffer));
+	memset(ipsec_buffer, 0, sizeof(ipsec_buffer));
 	ip = fin->fin_ip;
 	m = fin->fin_m;
 
@@ -120,7 +120,7 @@ nat_t *nat;
 		return -1;
 
 	ipsec = aps->aps_data;
-	bzero((char *)ipsec, sizeof(*ipsec));
+	memset((char *)ipsec, 0, sizeof(*ipsec));
 
 	/*
 	 * Create NAT rule against which the tunnel/transport mapping is
Index: sys/dist/ipf/netinet/ip_irc_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_irc_pxy.c,v
retrieving revision 1.10
diff -u -p -r1.10 ip_irc_pxy.c
--- sys/dist/ipf/netinet/ip_irc_pxy.c	11 Dec 2007 04:55:01 -0000	1.10
+++ sys/dist/ipf/netinet/ip_irc_pxy.c	19 Dec 2008 18:58:22 -0000
@@ -34,7 +34,7 @@ int	irc_proxy_init = 0;
  */
 int ippr_irc_init()
 {
-	bzero((char *)&ircnatfr, sizeof(ircnatfr));
+	memset((char *)&ircnatfr, 0, sizeof(ircnatfr));
 	ircnatfr.fr_ref = 1;
 	ircnatfr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&ircnatfr.fr_lock, "IRC proxy rule lock");
@@ -244,7 +244,7 @@ nat_t *nat;
 	aps->aps_data = irc;
 	aps->aps_psiz = sizeof(ircinfo_t);
 
-	bzero((char *)irc, sizeof(*irc));
+	memset((char *)irc, 0, sizeof(*irc));
 	return 0;
 }
 
@@ -272,7 +272,7 @@ nat_t *nat;
 	m = fin->fin_m;
 	ip = fin->fin_ip;
 	tcp = (tcphdr_t *)fin->fin_dp;
-	bzero(ctcpbuf, sizeof(ctcpbuf));
+	memset(ctcpbuf, 0, sizeof(ctcpbuf));
 	off = (char *)tcp - (char *)ip + (TCP_OFF(tcp) << 2) + fin->fin_ipoff;
 
 #ifdef __sgi
@@ -398,7 +398,7 @@ nat_t *nat;
 			     ip->ip_dst);
 	if (nat2 == NULL) {
 		bcopy((void *)fin, (void *)&fi, sizeof(fi));
-		bzero((char *)tcp2, sizeof(*tcp2));
+		memset((char *)tcp2, 0, sizeof(*tcp2));
 		tcp2->th_win = htons(8192);
 		tcp2->th_sport = sp;
 		tcp2->th_dport = 0; /* XXX - don't specify remote port */
Index: sys/dist/ipf/netinet/ip_log.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_log.c,v
retrieving revision 1.11
diff -u -p -r1.11 ip_log.c
--- sys/dist/ipf/netinet/ip_log.c	20 May 2008 07:08:07 -0000	1.11
+++ sys/dist/ipf/netinet/ip_log.c	19 Dec 2008 18:58:22 -0000
@@ -195,7 +195,7 @@ int fr_loginit()
 		ipll[i] = NULL;
 		iplh[i] = &iplt[i];
 		iplused[i] = 0;
-		bzero((char *)&iplcrc[i], sizeof(iplcrc[i]));
+		memset((char *)&iplcrc[i], 0, sizeof(iplcrc[i]));
 # ifdef	IPL_SELECT
 		iplog_ss[i].read_waiter = 0;
 		iplog_ss[i].state = 0;
@@ -459,7 +459,7 @@ int *types, cnt;
 			}
 			bcopy((char *)fin, (char *)&iplcrc[dev], FI_LCSIZE);
 		} else
-			bzero((char *)&iplcrc[dev], FI_CSIZE);
+			memset((char *)&iplcrc[dev], 0, FI_CSIZE);
 		MUTEX_EXIT(&ipl_mutex);
 	}
 
@@ -686,7 +686,7 @@ minor_t unit;
 	ipll[unit] = NULL;
 	used = iplused[unit];
 	iplused[unit] = 0;
-	bzero((char *)&iplcrc[unit], FI_CSIZE);
+	memset((char *)&iplcrc[unit], 0, FI_CSIZE);
 	MUTEX_EXIT(&ipl_mutex);
 	SPL_X(s);
 	return used;
Index: sys/dist/ipf/netinet/ip_nat.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_nat.c,v
retrieving revision 1.38
diff -u -p -r1.38 ip_nat.c
--- sys/dist/ipf/netinet/ip_nat.c	26 Jul 2008 19:44:28 -0000	1.38
+++ sys/dist/ipf/netinet/ip_nat.c	19 Dec 2008 18:58:23 -0000
@@ -231,25 +231,25 @@ int fr_natinit()
 
 	KMALLOCS(nat_table[0], nat_t **, sizeof(nat_t *) * ipf_nattable_sz);
 	if (nat_table[0] != NULL)
-		bzero((char *)nat_table[0], ipf_nattable_sz * sizeof(nat_t *));
+		memset((char *)nat_table[0], 0, ipf_nattable_sz * sizeof(nat_t *));
 	else
 		return -1;
 
 	KMALLOCS(nat_table[1], nat_t **, sizeof(nat_t *) * ipf_nattable_sz);
 	if (nat_table[1] != NULL)
-		bzero((char *)nat_table[1], ipf_nattable_sz * sizeof(nat_t *));
+		memset((char *)nat_table[1], 0, ipf_nattable_sz * sizeof(nat_t *));
 	else
 		return -2;
 
 	KMALLOCS(nat_rules, ipnat_t **, sizeof(ipnat_t *) * ipf_natrules_sz);
 	if (nat_rules != NULL)
-		bzero((char *)nat_rules, ipf_natrules_sz * sizeof(ipnat_t *));
+		memset((char *)nat_rules, 0, ipf_natrules_sz * sizeof(ipnat_t *));
 	else
 		return -3;
 
 	KMALLOCS(rdr_rules, ipnat_t **, sizeof(ipnat_t *) * ipf_rdrrules_sz);
 	if (rdr_rules != NULL)
-		bzero((char *)rdr_rules, ipf_rdrrules_sz * sizeof(ipnat_t *));
+		memset((char *)rdr_rules, 0, ipf_rdrrules_sz * sizeof(ipnat_t *));
 	else
 		return -4;
 
@@ -1461,7 +1461,7 @@ int getlock;
 	/*
 	 * Initialize all these so that nat_delete() doesn't cause a crash.
 	 */
-	bzero((char *)nat, offsetof(struct nat, nat_tqe));
+	memset((char *)nat, 0, offsetof(struct nat, nat_tqe));
 	nat->nat_tqe.tqe_pnext = NULL;
 	nat->nat_tqe.tqe_next = NULL;
 	nat->nat_tqe.tqe_ifq = NULL;
@@ -1478,7 +1478,7 @@ int getlock;
 			error = ENOMEM;
 			goto junkput;
 		}
-		bzero((char *)in, offsetof(struct ipnat, in_next6));
+		memset((char *)in, 0, offsetof(struct ipnat, in_next6));
 		bcopy((char *)&ipnn->ipn_ipnat, (char *)in, sizeof(*in));
 		in->in_use = 1;
 		in->in_flags |= IPN_DELETE;
@@ -1504,7 +1504,7 @@ int getlock;
 		error = ENOMEM;
 		goto junkput;
 	}
-	bzero(fin, sizeof(*fin));
+	memset(fin, 0, sizeof(*fin));
 	fin->fin_p = nat->nat_p;
 	fin->fin_ifp = nat->nat_ifps[0];
 	if (nat->nat_dir == NAT_OUTBOUND) {
@@ -1866,9 +1866,9 @@ static int nat_clearlist()
 	int i = 0;
 
 	if (nat_rules != NULL)
-		bzero((char *)nat_rules, sizeof(*nat_rules) * ipf_natrules_sz);
+		memset((char *)nat_rules, 0, sizeof(*nat_rules) * ipf_natrules_sz);
 	if (rdr_rules != NULL)
-		bzero((char *)rdr_rules, sizeof(*rdr_rules) * ipf_rdrrules_sz);
+		memset((char *)rdr_rules, 0, sizeof(*rdr_rules) * ipf_rdrrules_sz);
 
 	while ((n = *np) != NULL) {
 		*np = n->in_next;
@@ -2451,7 +2451,7 @@ int direction;
 		ni.nai_dport = ni.nai_sport;
 	}
 
-	bzero((char *)nat, sizeof(*nat));
+	memset((char *)nat, 0, sizeof(*nat));
 	nat->nat_flags = flags;
 	nat->nat_redir = np->in_redir;
 
@@ -3574,7 +3574,7 @@ natlookup_t *np;
 	fr_info_t fi;
 	nat_t *nat;
 
-	bzero((char *)&fi, sizeof(fi));
+	memset((char *)&fi, 0, sizeof(fi));
 	if (np->nl_flags & IPN_IN) {
 		fi.fin_data[0] = ntohs(np->nl_realport);
 		fi.fin_data[1] = ntohs(np->nl_outport);
@@ -3610,7 +3610,7 @@ natlookup_t *np;
 
 			if ((np->nl_flags & IPN_FINDFORWARD) != 0) {
 				fr_info_t fin;
-				bzero((char *)&fin, sizeof(fin));
+				memset((char *)&fin, 0, sizeof(fin));
 				fin.fin_p = nat->nat_p;
 				fin.fin_data[0] = ntohs(nat->nat_outport);
 				fin.fin_data[1] = ntohs(nat->nat_oport);
@@ -5174,7 +5174,7 @@ ipfgeniter_t *itp;
 					t->ipt_data = nexthm;
 				}
 			} else {
-				bzero(&zerohm, sizeof(zerohm));
+				memset(&zerohm, 0, sizeof(zerohm));
 				nexthm = &zerohm;
 				count = 1;
 				t->ipt_data = NULL;
@@ -5190,7 +5190,7 @@ ipfgeniter_t *itp;
 					t->ipt_data = nextipnat;
 				}
 			} else {
-				bzero(&zeroipn, sizeof(zeroipn));
+				memset(&zeroipn, 0, sizeof(zeroipn));
 				nextipnat = &zeroipn;
 				count = 1;
 				t->ipt_data = NULL;
@@ -5206,7 +5206,7 @@ ipfgeniter_t *itp;
 					t->ipt_data = nextnat;
 				}
 			} else {
-				bzero(&zeronat, sizeof(zeronat));
+				memset(&zeronat, 0, sizeof(zeronat));
 				nextnat = &zeronat;
 				count = 1;
 				t->ipt_data = NULL;
Index: sys/dist/ipf/netinet/ip_netbios_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_netbios_pxy.c,v
retrieving revision 1.4
diff -u -p -r1.4 ip_netbios_pxy.c
--- sys/dist/ipf/netinet/ip_netbios_pxy.c	11 Dec 2007 04:55:02 -0000	1.4
+++ sys/dist/ipf/netinet/ip_netbios_pxy.c	19 Dec 2008 18:58:23 -0000
@@ -52,7 +52,7 @@ int	netbios_proxy_init = 0;
  */
 int ippr_netbios_init()
 {
-	bzero((char *)&netbiosfr, sizeof(netbiosfr));
+	memset((char *)&netbiosfr, 0, sizeof(netbiosfr));
 	netbiosfr.fr_ref = 1;
 	netbiosfr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&netbiosfr.fr_lock, "NETBIOS proxy rule lock");
Index: sys/dist/ipf/netinet/ip_pool.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_pool.c,v
retrieving revision 1.12
diff -u -p -r1.12 ip_pool.c
--- sys/dist/ipf/netinet/ip_pool.c	20 May 2008 07:08:08 -0000	1.12
+++ sys/dist/ipf/netinet/ip_pool.c	19 Dec 2008 18:58:23 -0000
@@ -129,10 +129,10 @@ main(argc, argv)
 	RWLOCK_INIT(&ip_poolrw, "poolrw");
 	ip_pool_init();
 
-	bzero((char *)&a, sizeof(a));
-	bzero((char *)&b, sizeof(b));
-	bzero((char *)&ip, sizeof(ip));
-	bzero((char *)&op, sizeof(op));
+	memset((char *)&a, 0, sizeof(a));
+	memset((char *)&b, 0, sizeof(b));
+	memset((char *)&ip, 0, sizeof(ip));
+	memset((char *)&op, 0, sizeof(op));
 	strlcpy(op.iplo_name, "0", sizeof(op.iplo_name));
 
 	if (ip_pool_create(&op) == 0)
@@ -240,7 +240,7 @@ ip_pool_t *ipo;
 int ip_pool_init()
 {
 
-	bzero((char *)&ipoolstat, sizeof(ipoolstat));
+	memset((char *)&ipoolstat, 0, sizeof(ipoolstat));
 
 #if (!defined(_KERNEL) || (BSD < 199306))
 	rn_init();
@@ -409,7 +409,7 @@ void *dptr;
 	rv = 1;
 	m = NULL;
 	addr = (i6addr_t *)dptr;
-	bzero(&v, sizeof(v));
+	memset(&v, 0, sizeof(v));
 	v.adf_len = offsetof(addrfamily_t, adf_addr);
 
 	if (ipversion == 4) {
@@ -465,7 +465,7 @@ int info;
 		return ENOMEM;
 	}
 
-	bzero(x, sizeof(*x));
+	memset(x, 0, sizeof(*x));
 
 	x->ipn_info = info;
 	(void)strncpy(x->ipn_name, ipo->ipo_name, sizeof(x->ipn_name));
@@ -539,7 +539,7 @@ iplookupop_t *op;
 	KMALLOC(h, ip_pool_t *);
 	if (h == NULL)
 		return ENOMEM;
-	bzero(h, sizeof(*h));
+	memset(h, 0, sizeof(*h));
 
 	if (rn_inithead((void **)&h->ipo_head,
 			offsetof(addrfamily_t, adf_addr) << 3) == 0) {
@@ -844,7 +844,7 @@ ipflookupiter_t *ilp;
 			ATOMIC_INC(nextipo->ipo_ref);
 			token->ipt_data = nextipo;
 		} else {
-			bzero((char *)&zp, sizeof(zp));
+			memset((char *)&zp, 0, sizeof(zp));
 			nextipo = &zp;
 			token->ipt_data = NULL;
 		}
@@ -868,7 +868,7 @@ ipflookupiter_t *ilp;
 			ATOMIC_INC(nextnode->ipn_ref);
 			token->ipt_data = nextnode;
 		} else {
-			bzero((char *)&zn, sizeof(zn));
+			memset((char *)&zn, 0, sizeof(zn));
 			nextnode = &zn;
 			token->ipt_data = NULL;
 		}
Index: sys/dist/ipf/netinet/ip_pptp_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_pptp_pxy.c,v
retrieving revision 1.8
diff -u -p -r1.8 ip_pptp_pxy.c
--- sys/dist/ipf/netinet/ip_pptp_pxy.c	11 Dec 2007 04:55:03 -0000	1.8
+++ sys/dist/ipf/netinet/ip_pptp_pxy.c	19 Dec 2008 18:58:23 -0000
@@ -61,7 +61,7 @@ int	ippr_pptp_gretimeout = IPF_TTLVAL(12
  */
 int ippr_pptp_init()
 {
-	bzero((char *)&pptpfr, sizeof(pptpfr));
+	memset((char *)&pptpfr, 0, sizeof(pptpfr));
 	pptpfr.fr_ref = 1;
 	pptpfr.fr_age[0] = ippr_pptp_gretimeout;
 	pptpfr.fr_age[1] = ippr_pptp_gretimeout;
@@ -122,7 +122,7 @@ nat_t *nat;
 	 * describe GRE but TCP instead.
 	 */
 	pptp = aps->aps_data;
-	bzero((char *)pptp, sizeof(*pptp));
+	memset((char *)pptp, 0, sizeof(*pptp));
 	ipn = &pptp->pptp_rule;
 	ipn->in_ifps[0] = fin->fin_ifp;
 	ipn->in_apr = NULL;
@@ -170,7 +170,7 @@ pptp_pxy_t *pptp;
 	nat2 = pptp->pptp_nat;
 	if ((nat2 == NULL) || (pptp->pptp_state == NULL)) {
 		bcopy((char *)fin, (char *)&fi, sizeof(fi));
-		bzero((char *)&gre, sizeof(gre));
+		memset((char *)&gre, 0, sizeof(gre));
 		fi.fin_state = NULL;
 		fi.fin_nat = NULL;
 		fi.fin_fi.fi_p = IPPROTO_GRE;
Index: sys/dist/ipf/netinet/ip_proxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_proxy.c,v
retrieving revision 1.18
diff -u -p -r1.18 ip_proxy.c
--- sys/dist/ipf/netinet/ip_proxy.c	20 May 2008 07:08:08 -0000	1.18
+++ sys/dist/ipf/netinet/ip_proxy.c	19 Dec 2008 18:58:23 -0000
@@ -432,7 +432,7 @@ nat_t *nat;
 		return -1;
 	}
 
-	bzero((char *)aps, sizeof(*aps));
+	memset((char *)aps, 0, sizeof(*aps));
 	aps->aps_p = fin->fin_p;
 	aps->aps_data = NULL;
 	aps->aps_apr = apr;
Index: sys/dist/ipf/netinet/ip_raudio_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_raudio_pxy.c,v
retrieving revision 1.5
diff -u -p -r1.5 ip_raudio_pxy.c
--- sys/dist/ipf/netinet/ip_raudio_pxy.c	11 Dec 2007 04:55:03 -0000	1.5
+++ sys/dist/ipf/netinet/ip_raudio_pxy.c	19 Dec 2008 18:58:23 -0000
@@ -30,7 +30,7 @@ int	raudio_proxy_init = 0;
  */
 int ippr_raudio_init()
 {
-	bzero((char *)&raudiofr, sizeof(raudiofr));
+	memset((char *)&raudiofr, 0, sizeof(raudiofr));
 	raudiofr.fr_ref = 1;
 	raudiofr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&raudiofr.fr_lock, "Real Audio proxy rule lock");
@@ -66,7 +66,7 @@ nat_t *nat;
 	fin = fin;	/* LINT */
 	nat = nat;	/* LINT */
 
-	bzero(aps->aps_data, sizeof(raudio_t));
+	memset(aps->aps_data, 0, sizeof(raudio_t));
 	rap = aps->aps_data;
 	aps->aps_psiz = sizeof(raudio_t);
 	rap->rap_mode = RAP_M_TCP;	/* default is for TCP */
@@ -113,7 +113,7 @@ nat_t *nat;
 	if (dlen > sizeof(membuf))
 		dlen = sizeof(membuf);
 
-	bzero((char *)membuf, sizeof(membuf));
+	memset((char *)membuf, 0, sizeof(membuf));
 	COPYDATA(m, off, dlen, (char *)membuf);
 	/*
 	 * In all the startup parsing, ensure that we don't go outside
@@ -224,7 +224,7 @@ nat_t *nat;
 	if (dlen > sizeof(membuf))
 		dlen = sizeof(membuf);
 
-	bzero((char *)membuf, sizeof(membuf));
+	memset((char *)membuf, 0, sizeof(membuf));
 	COPYDATA(m, off, dlen, (char *)membuf);
 
 	seq = ntohl(tcp->th_seq);
@@ -278,7 +278,7 @@ nat_t *nat;
 	ip->ip_dst = nat->nat_oip;
 
 	bcopy((char *)fin, (char *)&fi, sizeof(fi));
-	bzero((char *)tcp2, sizeof(*tcp2));
+	memset((char *)tcp2, 0, sizeof(*tcp2));
 	TCP_OFF_A(tcp2, 5);
 	fi.fin_state = NULL;
 	fi.fin_nat = NULL;
Index: sys/dist/ipf/netinet/ip_rcmd_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_rcmd_pxy.c,v
retrieving revision 1.10
diff -u -p -r1.10 ip_rcmd_pxy.c
--- sys/dist/ipf/netinet/ip_rcmd_pxy.c	11 Dec 2007 04:55:03 -0000	1.10
+++ sys/dist/ipf/netinet/ip_rcmd_pxy.c	19 Dec 2008 18:58:23 -0000
@@ -35,7 +35,7 @@ int	rcmd_proxy_init = 0;
  */
 int ippr_rcmd_init()
 {
-	bzero((char *)&rcmdfr, sizeof(rcmdfr));
+	memset((char *)&rcmdfr, 0, sizeof(rcmdfr));
 	rcmdfr.fr_ref = 1;
 	rcmdfr.fr_flags = FR_INQUE|FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&rcmdfr.fr_lock, "RCMD proxy rule lock");
@@ -137,7 +137,7 @@ nat_t *nat;
 	if (dlen <= 0)
 		return 0;
 
-	bzero(portbuf, sizeof(portbuf));
+	memset(portbuf, 0, sizeof(portbuf));
 	COPYDATA(m, off, MIN(sizeof(portbuf), dlen), portbuf);
 
 	portbuf[sizeof(portbuf) - 1] = '\0';
@@ -172,7 +172,7 @@ nat_t *nat;
 
 		slen = ip->ip_len;
 		ip->ip_len = fin->fin_hlen + sizeof(*tcp);
-		bzero((char *)tcp2, sizeof(*tcp2));
+		memset((char *)tcp2, 0, sizeof(*tcp2));
 		tcp2->th_win = htons(8192);
 		tcp2->th_sport = htons(sp);
 		tcp2->th_dport = 0; /* XXX - don't specify remote port */
Index: sys/dist/ipf/netinet/ip_rpcb_pxy.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_rpcb_pxy.c,v
retrieving revision 1.13
diff -u -p -r1.13 ip_rpcb_pxy.c
--- sys/dist/ipf/netinet/ip_rpcb_pxy.c	20 May 2008 07:08:08 -0000	1.13
+++ sys/dist/ipf/netinet/ip_rpcb_pxy.c	19 Dec 2008 18:58:23 -0000
@@ -115,7 +115,7 @@ ippr_rpcb_init()
 {
 	rpcbcnt = 0;
 
-	bzero((char *)&rpcbfr, sizeof(rpcbfr));
+	memset((char *)&rpcbfr, 0, sizeof(rpcbfr));
 	rpcbfr.fr_ref = 1;
 	rpcbfr.fr_flags = FR_PASS|FR_QUICK|FR_KEEPSTATE;
 	MUTEX_INIT(&rpcbfr.fr_lock, "ipf Sun RPCB proxy rule lock");
@@ -164,7 +164,7 @@ ippr_rpcb_new(fin, aps, nat)
 	if (rs == NULL)
 		return(-1);
 
-	bzero((char *)rs, sizeof(*rs));
+	memset((char *)rs, 0, sizeof(*rs));
 	MUTEX_INIT(&rs->rs_rxlock, "ipf Sun RPCB proxy session lock");
 
 	aps->aps_data = rs;
@@ -235,7 +235,7 @@ ippr_rpcb_in(fin, aps, nat)
 
 	/* Copy packet over to convenience buffer. */
 	rm = &rpcmsg;
-	bzero((char *)rm, sizeof(*rm));
+	memset((char *)rm, 0, sizeof(*rm));
 	COPYDATA(m, off, dlen, (void *)&rm->rm_msgbuf);
 	rm->rm_buflen = dlen;
 
@@ -311,7 +311,7 @@ ippr_rpcb_out(fin, aps, nat)
 
 	/* Copy packet over to convenience buffer. */
 	rm = &rpcmsg;
-	bzero((char *)rm, sizeof(*rm));
+	memset((char *)rm, 0, sizeof(*rm));
 	COPYDATA(m, off, dlen, (void *)&rm->rm_msgbuf);
 	rm->rm_buflen = dlen;
 
@@ -430,7 +430,7 @@ ippr_rpcb_decodereq(fin, nat, rs, rm)
 	p = (u_32_t *)rm->rm_msgbuf;
 	mod = 0;
 
-	bzero((char *)&rx, sizeof(rx));
+	memset((char *)&rx, 0, sizeof(rx));
 	rc = &rm->rm_call;
 
 	rm->rm_xid = p;
@@ -790,7 +790,7 @@ ippr_rpcb_modreq(fin, nat, rm, m, off)
 	p = (char *)&nat->nat_inport;
 
 	/* Form new string. */
-	bzero(uaddr, sizeof(uaddr)); /* Just in case we need padding. */
+	memset(uaddr, 0, sizeof(uaddr)); /* Just in case we need padding. */
 #if defined(SNPRINTF) && defined(_KERNEL)
 	SNPRINTF(uaddr, sizeof(uaddr),
 #else
@@ -874,7 +874,7 @@ ippr_rpcb_decoderep(fin, nat, rs, rm, rx
 
 	p = (u_32_t *)rm->rm_msgbuf;
 
-	bzero((char *)&rx, sizeof(rx));
+	memset((char *)&rx, 0, sizeof(rx));
 	rr = &rm->rm_resp;
 
 	rm->rm_xid = p;
@@ -1176,7 +1176,7 @@ ippr_rpcb_getnat(fin, nat, proto, port)
 	fi.fin_dport = port & 0xffff;
 	fi.fin_flx |= FI_IGNORE;
 
-	bzero((char *)&tcp, sizeof(tcp));
+	memset((char *)&tcp, 0, sizeof(tcp));
 	tcp.th_dport = htons(port);
 
 	if (proto == IPPROTO_TCP) {
@@ -1321,7 +1321,7 @@ ippr_rpcb_modv3(fin, nat, rm, m, off)
 	p = (char *)&rr->rr_v3.xu_port;
 
 	/* Form new string. */
-	bzero(uaddr, sizeof(uaddr)); /* Just in case we need padding. */
+	memset(uaddr, 0, sizeof(uaddr)); /* Just in case we need padding. */
 #if defined(SNPRINTF) && defined(_KERNEL)
 	SNPRINTF(uaddr, sizeof(uaddr),
 #else
@@ -1400,7 +1400,7 @@ ippr_rpcb_modv4(fin, nat, rm, m, off)
 		p = (char *)&re->re_maddr.xu_port;
 
 		/* Form new string. */
-		bzero(uaddr, sizeof(uaddr)); /* Just in case we need
+		memset(uaddr, 0, sizeof(uaddr)); /* Just in case we need
 						padding. */
 #if defined(SNPRINTF) && defined(_KERNEL)
 		SNPRINTF(uaddr, sizeof(uaddr),
Index: sys/dist/ipf/netinet/ip_scan.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_scan.c,v
retrieving revision 1.13
diff -u -p -r1.13 ip_scan.c
--- sys/dist/ipf/netinet/ip_scan.c	20 May 2008 07:08:08 -0000	1.13
+++ sys/dist/ipf/netinet/ip_scan.c	19 Dec 2008 18:58:23 -0000
@@ -566,9 +566,9 @@ ipstate_t *is;
 	 * buffered and stored for some time...
 	 */
 	if (!(is->is_flags & IS_SC_CLIENT))
-		bzero(is->is_sbuf[0], sizeof(is->is_sbuf[0]));
+		memset(is->is_sbuf[0], 0, sizeof(is->is_sbuf[0]));
 	if (!(is->is_flags & IS_SC_SERVER))
-		bzero(is->is_sbuf[1], sizeof(is->is_sbuf[1]));
+		memset(is->is_sbuf[1], 0, sizeof(is->is_sbuf[1]));
 #endif
 	return 0;
 }
Index: sys/dist/ipf/netinet/ip_state.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_state.c,v
retrieving revision 1.33
diff -u -p -r1.33 ip_state.c
--- sys/dist/ipf/netinet/ip_state.c	24 Jul 2008 09:37:58 -0000	1.33
+++ sys/dist/ipf/netinet/ip_state.c	19 Dec 2008 18:58:24 -0000
@@ -214,7 +214,7 @@ int fr_stateinit()
 	KMALLOCS(ips_table, ipstate_t **, fr_statesize * sizeof(ipstate_t *));
 	if (ips_table == NULL)
 		return -1;
-	bzero((char *)ips_table, fr_statesize * sizeof(ipstate_t *));
+	memset((char *)ips_table, 0, fr_statesize * sizeof(ipstate_t *));
 
 	KMALLOCS(ips_seed, u_long *, fr_statesize * sizeof(*ips_seed));
 	if (ips_seed == NULL)
@@ -263,7 +263,7 @@ int fr_stateinit()
 		 fr_statesize * sizeof(u_long));
 	if (ips_stats.iss_bucketlen == NULL)
 		return -1;
-	bzero((char *)ips_stats.iss_bucketlen, fr_statesize * sizeof(u_long));
+	memset((char *)ips_stats.iss_bucketlen, 0, fr_statesize * sizeof(u_long));
 
 	if (fr_state_maxbucket == 0) {
 		for (i = fr_statesize; i > 0; i >>= 1)
@@ -740,7 +740,7 @@ void *data;
 		return ENOMEM;
 
 	bcopy((char *)&ips.ips_is, (char *)isn, sizeof(*isn));
-	bzero((char *)isn, offsetof(struct ipstate, is_pkts));
+	memset((char *)isn, 0, offsetof(struct ipstate, is_pkts));
 	isn->is_sti.tqe_pnext = NULL;
 	isn->is_sti.tqe_next = NULL;
 	isn->is_sti.tqe_ifq = NULL;
@@ -1177,7 +1177,7 @@ u_int flags;
 	tcp = NULL;
 	out = fin->fin_out;
 	is = &ips;
-	bzero((char *)is, sizeof(*is));
+	memset((char *)is, 0, sizeof(*is));
 	is->is_die = 1 + fr_ticks;
 
 	/*
@@ -2356,8 +2356,8 @@ fr_info_t *fin;
 	 * the IP6_EQ and IP6_NEQ macros produce the wrong results because
 	 * of the 'junk' in the unused part of the union
 	 */
-	bzero((char *)&src, sizeof(src));
-	bzero((char *)&dst, sizeof(dst));
+	memset((char *)&src, 0, sizeof(src));
+	memset((char *)&dst, 0, sizeof(dst));
 
 	/*
 	 * we make an fin entry to be able to feed it to
@@ -4363,7 +4363,7 @@ ipfgeniter_t *itp;
 				token->ipt_data = next;
 			}
 		} else {
-			bzero(&zero, sizeof(zero));
+			memset(&zero, 0, sizeof(zero));
 			next = &zero;
 			count = 1;
 			token->ipt_data = NULL;
Index: sys/dist/ipf/netinet/ip_sync.c
===================================================================
RCS file: /cvsroot/src/sys/dist/ipf/netinet/ip_sync.c,v
retrieving revision 1.11
diff -u -p -r1.11 ip_sync.c
--- sys/dist/ipf/netinet/ip_sync.c	4 Nov 2008 21:41:11 -0000	1.11
+++ sys/dist/ipf/netinet/ip_sync.c	19 Dec 2008 18:58:24 -0000
@@ -161,8 +161,8 @@ int ipfsync_init()
 	cv_init(&ipslwait, "ipsl condvar", CV_DRIVER, NULL);
 # endif
 
-	bzero((char *)syncnattab, sizeof(syncnattab));
-	bzero((char *)syncstatetab, sizeof(syncstatetab));
+	memset((char *)syncnattab, 0, sizeof(syncnattab));
+	memset((char *)syncstatetab, 0, sizeof(syncstatetab));
 
 	return 0;
 }
@@ -555,7 +555,7 @@ void *data;
 			break;
 		}
 
-		bzero((char *)is, offsetof(ipstate_t, is_die));
+		memset((char *)is, offsetof(ipstate_t, 0, is_die));
 		bcopy((char *)&sn.is_die, (char *)&is->is_die,
 		      sizeof(*is) - offsetof(ipstate_t, is_die));
 		ipfsync_storder(0, is);
@@ -742,7 +742,7 @@ void *data;
 		}
 
 		nat = (nat_t *)data;
-		bzero((char *)n, offsetof(nat_t, nat_age));
+		memset((char *)n, offsetof(nat_t, 0, nat_age));
 		bcopy((char *)&nat->nat_age, (char *)&n->nat_age,
 		      sizeof(*n) - offsetof(nat_t, nat_age));
 		ipfsync_natorder(0, n);
Index: sys/dist/pf/net/if_compat.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/if_compat.c,v
retrieving revision 1.2
diff -u -p -r1.2 if_compat.c
--- sys/dist/pf/net/if_compat.c	18 Jun 2008 09:06:27 -0000	1.2
+++ sys/dist/pf/net/if_compat.c	19 Dec 2008 18:58:24 -0000
@@ -263,7 +263,7 @@ if_getgroup(void *data, struct ifnet *if
 	TAILQ_FOREACH(ifgl, ifgh, ifgl_next) {
 		if (len < sizeof(ifgrq))
 			return (EINVAL);
-		bzero(&ifgrq, sizeof ifgrq);
+		memset(&ifgrq, 0, sizeof ifgrq);
 		strlcpy(ifgrq.ifgrq_group, ifgl->ifgl_group->ifg_group,
 		    sizeof(ifgrq.ifgrq_group));
 		if ((error = copyout(&ifgrq, ifgp, sizeof(struct ifg_req))))
@@ -304,7 +304,7 @@ if_getgroupmembers(void *data)
 	TAILQ_FOREACH(ifgm, &ifg->ifg_members, ifgm_next) {
 		if (len < sizeof(ifgrq))
 			return (EINVAL);
-		bzero(&ifgrq, sizeof ifgrq);
+		memset(&ifgrq, 0, sizeof ifgrq);
 		strlcpy(ifgrq.ifgrq_member, ifgm->ifgm_ifp->if_xname,
 		    sizeof(ifgrq.ifgrq_member));
 		if ((error = copyout(&ifgrq, ifgp, sizeof(struct ifg_req))))
@@ -358,7 +358,7 @@ if_group_egress_build(void)
 			if_delgroup(ifgm->ifgm_ifp, IFG_EGRESS);
 		}
 
-	bzero(&sa_in, sizeof(sa_in));
+	memset(&sa_in, 0, sizeof(sa_in));
 	sa_in.sin_len = sizeof(sa_in);
 	sa_in.sin_family = AF_INET;
 	if ((rn = rt_lookup(sintosa(&sa_in), sintosa(&sa_in), 0)) != NULL) {
Index: sys/dist/pf/net/if_pflog.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/if_pflog.c,v
retrieving revision 1.14
diff -u -p -r1.14 if_pflog.c
--- sys/dist/pf/net/if_pflog.c	19 Dec 2008 18:49:38 -0000	1.14
+++ sys/dist/pf/net/if_pflog.c	19 Dec 2008 18:58:24 -0000
@@ -259,7 +259,7 @@ pflog_packet(struct pfi_kif *kif, struct
 	if ((ifn = pflogifs[rm->logif]) == NULL || !ifn->if_bpf)
 		return (0);
 
-	bzero(&hdr, sizeof(hdr));
+	memset(&hdr, 0, sizeof(hdr));
 	hdr.length = PFLOG_REAL_HDRLEN;
 	hdr.af = af;
 	hdr.action = rm->action;
Index: sys/dist/pf/net/pf.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf.c,v
retrieving revision 1.53
diff -u -p -r1.53 pf.c
--- sys/dist/pf/net/pf.c	11 Oct 2008 13:40:57 -0000	1.53
+++ sys/dist/pf/net/pf.c	19 Dec 2008 18:58:25 -0000
@@ -708,7 +708,7 @@ pf_src_connlimit(struct pf_state **state
 			    (*state)->state_key->af);
 		}
 
-		bzero(&p, sizeof(p));
+		memset(&p, 0, sizeof(p));
 		p.pfra_af = (*state)->state_key->af;
 		switch ((*state)->state_key->af) {
 #ifdef INET
@@ -797,7 +797,7 @@ pf_insert_src_node(struct pf_src_node **
 			pf_status.lcounters[LCNT_SRCNODES]++;
 		if ((*sn) == NULL)
 			return (-1);
-		bzero(*sn, sizeof(struct pf_src_node));
+		memset(*sn, 0, sizeof(struct pf_src_node));
 
 		pf_init_threshold(&(*sn)->conn_rate,
 		    rule->max_src_conn_rate.limit,
@@ -1734,7 +1734,7 @@ pf_send_tcp(const struct pf_rule *r, sa_
 	m->m_data += max_linkhdr;
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.rcvif = NULL;
-	bzero(m->m_data, len);
+	memset(m->m_data, 0, len);
 	switch (af) {
 #ifdef INET
 	case AF_INET:
@@ -2430,7 +2430,7 @@ pf_get_sport(sa_family_t af, u_int8_t pr
 	struct pf_addr		init_addr;
 	u_int16_t		cut;
 
-	bzero(&init_addr, sizeof(init_addr));
+	memset(&init_addr, 0, sizeof(init_addr));
 	if (pf_map_addr(af, r, saddr, naddr, &init_addr, sn))
 		return (1);
 
@@ -3053,7 +3053,7 @@ pf_alloc_state_key(struct pf_state *s)
 
 	if ((sk = pool_get(&pf_state_key_pl, PR_NOWAIT)) == NULL)
 		return (NULL);
-	bzero(sk, sizeof(*sk));
+	memset(sk, 0, sizeof(*sk));
 	TAILQ_INIT(&sk->states);
 	pf_attach_state(sk, s, 0);
 
@@ -3514,7 +3514,7 @@ cleanup:
 			}
 			return (PF_DROP);
 		}
-		bzero(s, sizeof(*s));
+		memset(s, 0, sizeof(*s));
 		s->rule.ptr = r;
 		s->nat_rule.ptr = nr;
 		s->anchor.ptr = a;
@@ -5061,7 +5061,7 @@ pf_routable(struct pf_addr *addr, sa_fam
 	struct route		 ro;
 	int			 ret = 1;
 
-	bzero(&ro, sizeof(ro));
+	memset(&ro, 0, sizeof(ro));
 	switch (af) {
 	case AF_INET:
 		sockaddr_in_init(&u.dst4, &addr->v4, 0);
@@ -5097,7 +5097,7 @@ pf_routable(struct pf_addr *addr, sa_fam
 	struct ifnet		*ifp;
 
 	check_mpath = 0;
-	bzero(&ro, sizeof(ro));
+	memset(&ro, 0, sizeof(ro));
 	switch (af) {
 	case AF_INET:
 		dst = satosin(&ro.ro_dst);
@@ -5177,7 +5177,7 @@ pf_rtlabel_match(struct pf_addr *addr, s
 #endif
 	int			 ret = 0;
 
-	bzero(&ro, sizeof(ro));
+	memset(&ro, 0, sizeof(ro));
 	switch (af) {
 	case AF_INET:
 		dst = satosin(&ro.ro_dst);
Index: sys/dist/pf/net/pf_if.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_if.c,v
retrieving revision 1.18
diff -u -p -r1.18 pf_if.c
--- sys/dist/pf/net/pf_if.c	19 Dec 2008 18:49:38 -0000	1.18
+++ sys/dist/pf/net/pf_if.c	19 Dec 2008 18:58:25 -0000
@@ -175,7 +175,7 @@ pfi_kif_get(const char *kif_name)
 	struct pfi_kif		*kif;
 	struct pfi_kif_cmp	 s;
 
-	bzero(&s, sizeof(s));
+	memset(&s, 0, sizeof(s));
 	strlcpy(s.pfik_name, kif_name, sizeof(s.pfik_name));
 	if ((kif = RB_FIND(pfi_ifhead, &pfi_ifs, (struct pfi_kif *)&s)) != NULL)
 		return (kif);
@@ -417,7 +417,7 @@ pfi_dynaddr_setup(struct pf_addr_wrap *a
 		return (0);
 	if ((dyn = pool_get(&pfi_addr_pl, PR_NOWAIT)) == NULL)
 		return (1);
-	bzero(dyn, sizeof(*dyn));
+	memset(dyn, 0, sizeof(*dyn));
 
 	s = splsoftnet();
 	if (!strcmp(aw->v.ifname, "self"))
@@ -623,7 +623,7 @@ pfi_address_add(struct sockaddr *sa, int
 	if (af == AF_INET && net > 32)
 		net = 128;
 	p = pfi_buffer + pfi_buffer_cnt++;
-	bzero(p, sizeof(*p));
+	memset(p, 0, sizeof(*p));
 	p->pfra_af = af;
 	p->pfra_net = net;
 	if (af == AF_INET)
@@ -701,8 +701,8 @@ pfi_fill_oldstatus(struct pf_status *pfs
 		splx(s);
 		return;
 	}
-	bzero(pfs->pcounters, sizeof(pfs->pcounters));
-	bzero(pfs->bcounters, sizeof(pfs->bcounters));
+	memset(pfs->pcounters, 0, sizeof(pfs->pcounters));
+	memset(pfs->bcounters, 0, sizeof(pfs->bcounters));
 	for (i = 0; i < 2; i++)
 		for (j = 0; j < 2; j++)
 			for (k = 0; k < 2; k++) {
@@ -724,8 +724,8 @@ pfi_clr_istats(const char *name)
 	RB_FOREACH(p, pfi_ifhead, &pfi_ifs) {
 		if (pfi_skip_if(name, p))
 			continue;
-		bzero(p->pfik_packets, sizeof(p->pfik_packets));
-		bzero(p->pfik_bytes, sizeof(p->pfik_bytes));
+		memset(p->pfik_packets, 0, sizeof(p->pfik_packets));
+		memset(p->pfik_bytes, 0, sizeof(p->pfik_bytes));
 		p->pfik_tzero = time_second;
 	}
 	splx(s);
Index: sys/dist/pf/net/pf_ioctl.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_ioctl.c,v
retrieving revision 1.34
diff -u -p -r1.34 pf_ioctl.c
--- sys/dist/pf/net/pf_ioctl.c	22 Jun 2008 11:36:33 -0000	1.34
+++ sys/dist/pf/net/pf_ioctl.c	19 Dec 2008 18:58:25 -0000
@@ -270,7 +270,7 @@ pfattach(int num)
 	timeout[PFTM_ADAPTIVE_END] = PFSTATE_ADAPT_END;
 
 	pf_normalize_init();
-	bzero(&pf_status, sizeof(pf_status));
+	memset(&pf_status, 0, sizeof(pf_status));
 	pf_status.debug = PF_DEBUG_URGENT;
 
 	/* XXX do our best to avoid a conflict */
@@ -547,7 +547,7 @@ tagname2tag(struct pf_tags *head, char *
 	    M_TEMP, M_NOWAIT);
 	if (tag == NULL)
 		return (0);
-	bzero(tag, sizeof(struct pf_tagname));
+	memset(tag, 0, sizeof(struct pf_tagname));
 	strlcpy(tag->name, tagname, sizeof(tag->name));
 	tag->tag = new_tagid;
 	tag->ref++;
@@ -1018,7 +1018,7 @@ pf_state_export(struct pfsync_state *sp,
    struct pf_state *s) 
 {
 	int secs = time_second;
-	bzero(sp, sizeof(struct pfsync_state));
+	memset(sp, 0, sizeof(struct pfsync_state));
 
 	/* copy from state key */
 	sp->lan.addr = sk->lan.addr;
@@ -1843,7 +1843,7 @@ pfioctl(dev_t dev, u_long cmd, void *add
 			error = ENOMEM;
 			break;
 		}
-		bzero(s, sizeof(struct pf_state));
+		memset(s, 0, sizeof(struct pf_state));
 		if ((sk = pf_alloc_state_key(s)) == NULL) {
 			error = ENOMEM;
 			break;
@@ -1938,7 +1938,7 @@ pfioctl(dev_t dev, u_long cmd, void *add
 		struct pfioc_if	*pi = (struct pfioc_if *)addr;
 
 		if (pi->ifname[0] == 0) {
-			bzero(pf_status.ifname, IFNAMSIZ);
+			memset(pf_status.ifname, 0, IFNAMSIZ);
 			break;
 		}
 		if (ifunit(pi->ifname) == NULL) {
@@ -1950,9 +1950,9 @@ pfioctl(dev_t dev, u_long cmd, void *add
 	}
 
 	case DIOCCLRSTATUS: {
-		bzero(pf_status.counters, sizeof(pf_status.counters));
-		bzero(pf_status.fcounters, sizeof(pf_status.fcounters));
-		bzero(pf_status.scounters, sizeof(pf_status.scounters));
+		memset(pf_status.counters, 0, sizeof(pf_status.counters));
+		memset(pf_status.fcounters, 0, sizeof(pf_status.fcounters));
+		memset(pf_status.scounters, 0, sizeof(pf_status.scounters));
 		pf_status.since = time_second;
 		if (*pf_status.ifname)
 			pfi_clr_istats(pf_status.ifname);
@@ -2775,7 +2775,7 @@ pfioctl(dev_t dev, u_long cmd, void *add
 				break;
 #endif /* ALTQ */
 			case PF_RULESET_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_begin(table,
@@ -2844,7 +2844,7 @@ pfioctl(dev_t dev, u_long cmd, void *add
 				break;
 #endif /* ALTQ */
 			case PF_RULESET_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_rollback(table,
@@ -2960,7 +2960,7 @@ pfioctl(dev_t dev, u_long cmd, void *add
 				break;
 #endif /* ALTQ */
 			case PF_RULESET_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_commit(table, ioe->ticket,
Index: sys/dist/pf/net/pf_mtag.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_mtag.c,v
retrieving revision 1.2
diff -u -p -r1.2 pf_mtag.c
--- sys/dist/pf/net/pf_mtag.c	18 Jun 2008 09:06:27 -0000	1.2
+++ sys/dist/pf/net/pf_mtag.c	19 Dec 2008 18:58:25 -0000
@@ -67,7 +67,7 @@ pf_get_mtag(struct mbuf *m)
 		    M_NOWAIT);
 		if (mtag == NULL)
 			return (NULL);
-		bzero(mtag + 1, sizeof(struct pf_mtag));
+		memset(mtag + 1, 0, sizeof(struct pf_mtag));
 		m_tag_prepend(m, mtag);
 	}
 
Index: sys/dist/pf/net/pf_norm.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_norm.c,v
retrieving revision 1.19
diff -u -p -r1.19 pf_norm.c
--- sys/dist/pf/net/pf_norm.c	18 Jun 2008 09:06:27 -0000	1.19
+++ sys/dist/pf/net/pf_norm.c	19 Dec 2008 18:58:26 -0000
@@ -1400,7 +1400,7 @@ pf_normalize_tcp_init(struct mbuf *m, in
 	src->scrub = pool_get(&pf_state_scrub_pl, PR_NOWAIT);
 	if (src->scrub == NULL)
 		return (1);
-	bzero(src->scrub, sizeof(*src->scrub));
+	memset(src->scrub, 0, sizeof(*src->scrub));
 
 	switch (pd->af) {
 #ifdef INET
Index: sys/dist/pf/net/pf_ruleset.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_ruleset.c,v
retrieving revision 1.2
diff -u -p -r1.2 pf_ruleset.c
--- sys/dist/pf/net/pf_ruleset.c	18 Jun 2008 09:06:27 -0000	1.2
+++ sys/dist/pf/net/pf_ruleset.c	19 Dec 2008 18:58:26 -0000
@@ -199,7 +199,7 @@ pf_find_or_create_ruleset(const char *pa
 	if (ruleset != NULL)
 		return (ruleset);
 	p = (char *)rs_malloc(MAXPATHLEN);
-	bzero(p, MAXPATHLEN);
+	memset(p, 0, MAXPATHLEN);
 	strlcpy(p, path, MAXPATHLEN);
 	while (parent == NULL && (q = strrchr(p, '/')) != NULL) {
 		*q = 0;
@@ -317,7 +317,7 @@ pf_anchor_setup(struct pf_rule *r, const
 	if (!name[0])
 		return (0);
 	path = (char *)rs_malloc(MAXPATHLEN);
-	bzero(path, MAXPATHLEN);
+	memset(path, 0, MAXPATHLEN);
 	if (name[0] == '/')
 		strlcpy(path, name + 1, MAXPATHLEN);
 	else {
@@ -375,7 +375,7 @@ pf_anchor_copyout(const struct pf_rulese
 		int	 i;
 
 		a = (char *)rs_malloc(MAXPATHLEN);
-		bzero(a, MAXPATHLEN);
+		memset(a, 0, MAXPATHLEN);
 		if (rs->anchor == NULL)
 			a[0] = 0;
 		else
Index: sys/dist/pf/net/pf_table.c
===================================================================
RCS file: /cvsroot/src/sys/dist/pf/net/pf_table.c,v
retrieving revision 1.14
diff -u -p -r1.14 pf_table.c
--- sys/dist/pf/net/pf_table.c	18 Jun 2008 09:06:27 -0000	1.14
+++ sys/dist/pf/net/pf_table.c	19 Dec 2008 18:58:26 -0000
@@ -608,7 +608,7 @@ pfr_get_addrs(struct pfr_table *tbl, str
 		return (0);
 	}
 
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = PFRW_GET_ADDRS;
 	w.pfrw_addr = addr;
 	w.pfrw_free = kt->pfrkt_cnt;
@@ -650,7 +650,7 @@ pfr_get_astats(struct pfr_table *tbl, st
 		return (0);
 	}
 
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = PFRW_GET_ASTATS;
 	w.pfrw_astats = addr;
 	w.pfrw_free = kt->pfrkt_cnt;
@@ -771,7 +771,7 @@ pfr_enqueue_addrs(struct pfr_ktable *kt,
 	struct pfr_walktree	w;
 
 	SLIST_INIT(workq);
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = sweep ? PFRW_SWEEP : PFRW_ENQUEUE;
 	w.pfrw_workq = workq;
 	if (kt->pfrkt_ip4 != NULL)
@@ -789,7 +789,7 @@ pfr_mark_addrs(struct pfr_ktable *kt)
 {
 	struct pfr_walktree	w;
 
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = PFRW_MARK;
 	if (rn_walktree(kt->pfrkt_ip4, pfr_walktree, &w))
 		printf("pfr_mark_addrs: IPv4 walktree failed.\n");
@@ -806,7 +806,7 @@ pfr_lookup_addr(struct pfr_ktable *kt, s
 	struct pfr_kentry	*ke;
 	int			 s;
 
-	bzero(&sa, sizeof(sa));
+	memset(&sa, 0, sizeof(sa));
 	if (ad->pfra_af == AF_INET) {
 		FILLIN_SIN(sa.sin, ad->pfra_ip4addr);
 		head = kt->pfrkt_ip4;
@@ -842,7 +842,7 @@ pfr_create_kentry(struct pfr_addr *ad, i
 		ke = pool_get(&pfr_kentry_pl, PR_NOWAIT);
 	if (ke == NULL)
 		return (NULL);
-	bzero(ke, sizeof(*ke));
+	memset(ke, 0, sizeof(*ke));
 
 	if (ad->pfra_af == AF_INET)
 		FILLIN_SIN(ke->pfrke_sa.sin, ad->pfra_ip4addr);
@@ -953,8 +953,8 @@ pfr_clstats_kentries(struct pfr_kentrywo
 		s = splsoftnet();
 		if (negchange)
 			p->pfrke_not = !p->pfrke_not;
-		bzero(p->pfrke_packets, sizeof(p->pfrke_packets));
-		bzero(p->pfrke_bytes, sizeof(p->pfrke_bytes));
+		memset(p->pfrke_packets, 0, sizeof(p->pfrke_packets));
+		memset(p->pfrke_bytes, 0, sizeof(p->pfrke_bytes));
 		splx(s);
 		p->pfrke_tzero = tzero;
 	}
@@ -980,7 +980,7 @@ pfr_prepare_network(union sockaddr_union
 {
 	int	i;
 
-	bzero(sa, sizeof(*sa));
+	memset(sa, 0, sizeof(*sa));
 	if (af == AF_INET) {
 		sa->sin.sin_len = sizeof(sa->sin);
 		sa->sin.sin_family = AF_INET;
@@ -1008,7 +1008,7 @@ pfr_route_kentry(struct pfr_ktable *kt, 
 	struct radix_node_head	*head = (void *)0xdeadb;
 	int			 s;
 
-	bzero(ke->pfrke_node, sizeof(ke->pfrke_node));
+	memset(ke->pfrke_node, 0, sizeof(ke->pfrke_node));
 	if (ke->pfrke_af == AF_INET)
 		head = kt->pfrkt_ip4;
 	else if (ke->pfrke_af == AF_INET6)
@@ -1056,7 +1056,7 @@ pfr_unroute_kentry(struct pfr_ktable *kt
 void
 pfr_copyout_addr(struct pfr_addr *ad, struct pfr_kentry *ke)
 {
-	bzero(ad, sizeof(*ad));
+	memset(ad, 0, sizeof(*ad));
 	if (ke == NULL)
 		return;
 	ad->pfra_af = ke->pfrke_af;
@@ -1218,7 +1218,7 @@ pfr_add_tables(struct pfr_table *tbl, in
 				goto _skip;
 
 			/* find or create root table */
-			bzero(key.pfrkt_anchor, sizeof(key.pfrkt_anchor));
+			memset(key.pfrkt_anchor, 0, sizeof(key.pfrkt_anchor));
 			r = RB_FIND(pfr_ktablehead, &pfr_ktables, &key);
 			if (r != NULL) {
 				p->pfrkt_root = r;
@@ -1544,7 +1544,7 @@ pfr_ina_define(struct pfr_table *tbl, st
 			goto _skip;
 
 		/* find or create root table */
-		bzero(&key, sizeof(key));
+		memset(&key, 0, sizeof(key));
 		strlcpy(key.pfrkt_name, tbl->pfrt_name, sizeof(key.pfrkt_name));
 		rt = RB_FIND(pfr_ktablehead, &pfr_ktables, &key);
 		if (rt != NULL) {
@@ -1904,8 +1904,8 @@ pfr_clstats_ktable(struct pfr_ktable *kt
 		pfr_clstats_kentries(&addrq, tzero, 0);
 	}
 	s = splsoftnet();
-	bzero(kt->pfrkt_packets, sizeof(kt->pfrkt_packets));
-	bzero(kt->pfrkt_bytes, sizeof(kt->pfrkt_bytes));
+	memset(kt->pfrkt_packets, 0, sizeof(kt->pfrkt_packets));
+	memset(kt->pfrkt_bytes, 0, sizeof(kt->pfrkt_bytes));
 	kt->pfrkt_match = kt->pfrkt_nomatch = 0;
 	splx(s);
 	kt->pfrkt_tzero = tzero;
@@ -1921,7 +1921,7 @@ pfr_create_ktable(struct pfr_table *tbl,
 	kt = pool_get(&pfr_ktable_pl, PR_NOWAIT);
 	if (kt == NULL)
 		return (NULL);
-	bzero(kt, sizeof(*kt));
+	memset(kt, 0, sizeof(*kt));
 	kt->pfrkt_t = *tbl;
 
 	if (attachruleset) {
@@ -2091,7 +2091,7 @@ pfr_attach_table(struct pf_ruleset *rs, 
 	struct pfr_table	 tbl;
 	struct pf_anchor	*ac = rs->anchor;
 
-	bzero(&tbl, sizeof(tbl));
+	memset(&tbl, 0, sizeof(tbl));
 	strlcpy(tbl.pfrt_name, name, sizeof(tbl.pfrt_name));
 	if (ac != NULL)
 		strlcpy(tbl.pfrt_anchor, ac->path, sizeof(tbl.pfrt_anchor));
@@ -2101,7 +2101,7 @@ pfr_attach_table(struct pf_ruleset *rs, 
 		if (kt == NULL)
 			return (NULL);
 		if (ac != NULL) {
-			bzero(tbl.pfrt_anchor, sizeof(tbl.pfrt_anchor));
+			memset(tbl.pfrt_anchor, 0, sizeof(tbl.pfrt_anchor));
 			rt = pfr_lookup_table(&tbl);
 			if (rt == NULL) {
 				rt = pfr_create_ktable(&tbl, 0, 1);
@@ -2218,7 +2218,7 @@ pfr_kentry_byidx(struct pfr_ktable *kt, 
 {
 	struct pfr_walktree	w;
 
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = PFRW_POOL_GET;
 	w.pfrw_cnt = idx;
 
@@ -2244,7 +2244,7 @@ pfr_dynaddr_update(struct pfr_ktable *kt
 	struct pfr_walktree	w;
 	int			s;
 
-	bzero(&w, sizeof(w));
+	memset(&w, 0, sizeof(w));
 	w.pfrw_op = PFRW_DYNADDR_UPDATE;
 	w.pfrw_dyn = dyn;
 
Index: sys/external/bsd/drm/dist/bsd-core/drm_context.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/drm_context.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 drm_context.c
--- sys/external/bsd/drm/dist/bsd-core/drm_context.c	19 Jul 2008 05:30:37 -0000	1.1.1.1
+++ sys/external/bsd/drm/dist/bsd-core/drm_context.c	19 Dec 2008 18:58:26 -0000
@@ -226,7 +226,7 @@ int drm_resctx(struct drm_device *dev, v
 	int i;
 
 	if ( res->count >= DRM_RESERVED_CONTEXTS ) {
-		bzero(&ctx, sizeof(ctx));
+		memset(&ctx, 0, sizeof(ctx));
 		for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
 			ctx.handle = i;
 			if ( DRM_COPY_TO_USER( &res->contexts[i],
Index: sys/external/bsd/drm/dist/bsd-core/i915_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 i915_drv.c
--- sys/external/bsd/drm/dist/bsd-core/i915_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/i915_drv.c	19 Dec 2008 18:58:26 -0000
@@ -115,7 +115,7 @@ i915_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	i915_configure(dev);
 	return drm_attach(nbdev, i915_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/mach64_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 mach64_drv.c
--- sys/external/bsd/drm/dist/bsd-core/mach64_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/mach64_drv.c	19 Dec 2008 18:58:26 -0000
@@ -87,7 +87,7 @@ mach64_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	mach64_configure(dev);
 	return drm_attach(nbdev, mach64_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/mga_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c,v
retrieving revision 1.3
diff -u -p -r1.3 mga_drv.c
--- sys/external/bsd/drm/dist/bsd-core/mga_drv.c	19 Jul 2008 07:02:15 -0000	1.3
+++ sys/external/bsd/drm/dist/bsd-core/mga_drv.c	19 Dec 2008 18:58:26 -0000
@@ -137,7 +137,7 @@ mga_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	mga_configure(dev);
 	return drm_attach(nbdev, mga_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/r128_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 r128_drv.c
--- sys/external/bsd/drm/dist/bsd-core/r128_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/r128_drv.c	19 Dec 2008 18:58:26 -0000
@@ -87,7 +87,7 @@ r128_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	r128_configure(dev);
 	return drm_attach(nbdev, r128_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 radeon_drv.c
--- sys/external/bsd/drm/dist/bsd-core/radeon_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/radeon_drv.c	19 Dec 2008 18:58:26 -0000
@@ -93,7 +93,7 @@ radeon_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	radeon_configure(dev);
 	return drm_attach(nbdev, radeon_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/savage_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 savage_drv.c
--- sys/external/bsd/drm/dist/bsd-core/savage_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/savage_drv.c	19 Dec 2008 18:58:26 -0000
@@ -75,7 +75,7 @@ savage_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	savage_configure(dev);
 	return drm_attach(nbdev, savage_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/sis_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 sis_drv.c
--- sys/external/bsd/drm/dist/bsd-core/sis_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/sis_drv.c	19 Dec 2008 18:58:26 -0000
@@ -68,7 +68,7 @@ sis_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	sis_configure(dev);
 	return drm_attach(nbdev, sis_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 tdfx_drv.c
--- sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c	19 Dec 2008 18:58:26 -0000
@@ -69,7 +69,7 @@ tdfx_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	tdfx_configure(dev);
 	return drm_attach(nbdev, tdfx_pciidlist);
 }
Index: sys/external/bsd/drm/dist/bsd-core/via_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/via_drv.c,v
retrieving revision 1.2
diff -u -p -r1.2 via_drv.c
--- sys/external/bsd/drm/dist/bsd-core/via_drv.c	19 Jul 2008 06:18:23 -0000	1.2
+++ sys/external/bsd/drm/dist/bsd-core/via_drv.c	19 Dec 2008 18:58:26 -0000
@@ -81,7 +81,7 @@ via_attach(device_t nbdev)
 {
 	struct drm_device *dev = device_get_softc(nbdev);
 
-	bzero(dev, sizeof(struct drm_device));
+	memset(dev, 0, sizeof(struct drm_device));
 	via_configure(dev);
 	return drm_attach(nbdev, via_pciidlist);
 }
Index: sys/fs/ntfs/ntfs_compr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/ntfs/ntfs_compr.c,v
retrieving revision 1.4
diff -u -p -r1.4 ntfs_compr.c
--- sys/fs/ntfs/ntfs_compr.c	29 Jan 2008 18:21:10 -0000	1.4
+++ sys/fs/ntfs/ntfs_compr.c	19 Dec 2008 18:58:26 -0000
@@ -70,7 +70,7 @@ ntfs_uncompblock(
 			    len, 0xfff));
 		}
 		memcpy(dbuf, cbuf + 2, len + 1);
-		bzero(dbuf + len + 1, NTFS_COMPBLOCK_SIZE - 1 - len);
+		memset(dbuf + len + 1, 0, NTFS_COMPBLOCK_SIZE - 1 - len);
 		return len + 3;
 	}
 	cpos = 2;
Index: sys/fs/ntfs/ntfs_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/ntfs/ntfs_subr.c,v
retrieving revision 1.38
diff -u -p -r1.38 ntfs_subr.c
--- sys/fs/ntfs/ntfs_subr.c	17 Dec 2008 20:51:35 -0000	1.38
+++ sys/fs/ntfs/ntfs_subr.c	19 Dec 2008 18:58:26 -0000
@@ -1716,7 +1716,7 @@ ntfs_readntvattr_plain(
 					for(; remains; remains--)
 						uiomove(vbuf, 1, uio);
 				} else
-					bzero(data, tocopy);
+					memset(data, 0, tocopy);
 				data = (char *)data + tocopy;
 			}
 			cnt++;
@@ -1867,7 +1867,7 @@ ntfs_readattr(
 						uiomove(vbuf, 1, uio);
 				}
 				else
-					bzero(data, tocopy);
+					memset(data, 0, tocopy);
 			} else {
 				error = ntfs_uncompunit(ntmp, uup, cup);
 				if (error)
Index: sys/fs/smbfs/smbfs_io.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_io.c,v
retrieving revision 1.30
diff -u -p -r1.30 smbfs_io.c
--- sys/fs/smbfs/smbfs_io.c	24 Apr 2008 15:35:28 -0000	1.30
+++ sys/fs/smbfs/smbfs_io.c	19 Dec 2008 18:58:26 -0000
@@ -339,7 +339,7 @@ smbfs_doio(struct buf *bp, kauth_cred_t 
 			int left = uiop->uio_resid;
 			int nread = bp->b_bcount - left;
 			if (left > 0)
-			    bzero((char *)bp->b_data + nread, left);
+			    memset((char *)bp->b_data + nread, 0, left);
 		}
 		break;
 	    default:
Index: sys/fs/smbfs/smbfs_smb.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_smb.c,v
retrieving revision 1.37
diff -u -p -r1.37 smbfs_smb.c
--- sys/fs/smbfs/smbfs_smb.c	24 Jun 2008 10:23:48 -0000	1.37
+++ sys/fs/smbfs/smbfs_smb.c	19 Dec 2008 18:58:27 -0000
@@ -1301,7 +1301,7 @@ smbfs_smb_lookup(struct smbnode *dnp, co
 	int error;
 
 	if (dnp == NULL || (dnp->n_ino == 2 && name == NULL)) {
-		bzero(fap, sizeof(*fap));
+		memset(fap, 0, sizeof(*fap));
 		fap->fa_attr = SMB_FA_DIR;
 		fap->fa_ino = 2;
 		return 0;
Index: sys/fs/udf/udf_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/udf/udf_subr.c,v
retrieving revision 1.83
diff -u -p -r1.83 udf_subr.c
--- sys/fs/udf/udf_subr.c	19 Dec 2008 18:49:39 -0000	1.83
+++ sys/fs/udf/udf_subr.c	19 Dec 2008 18:58:28 -0000
@@ -307,7 +307,7 @@ udf_synchronise_caches(struct udf_mount 
 	if (ump->discinfo.mmc_class == MMC_CLASS_DISC)
 		return 0;
 
-	bzero(&mmc_op, sizeof(struct mmc_op));
+	memset(&mmc_op, 0, sizeof(struct mmc_op));
 	mmc_op.operation = MMC_OP_SYNCHRONISECACHE;
 
 	/* ignore return code */
@@ -2136,7 +2136,7 @@ udf_adjust_filecount(struct udf_node *ud
 void
 udf_osta_charset(struct charspec *charspec)
 {
-	bzero(charspec, sizeof(struct charspec));
+	memset(charspec, 0, sizeof(struct charspec));
 	charspec->type = 0;
 	strcpy((char *) charspec->inf, "OSTA Compressed Unicode");
 }
@@ -2146,7 +2146,7 @@ udf_osta_charset(struct charspec *charsp
 void
 udf_set_regid(struct regid *regid, char const *name)
 {
-	bzero(regid, sizeof(struct regid));
+	memset(regid, 0, sizeof(struct regid));
 	regid->flags    = 0;		/* not dirty and not protected */
 	strcpy((char *) regid->id, name);
 }
Index: sys/kern/subr_tftproot.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_tftproot.c,v
retrieving revision 1.5
diff -u -p -r1.5 subr_tftproot.c
--- sys/kern/subr_tftproot.c	24 Apr 2008 11:38:36 -0000	1.5
+++ sys/kern/subr_tftproot.c	19 Dec 2008 18:58:28 -0000
@@ -179,7 +179,7 @@ tftproot_dhcpboot(bootdv)
 
 	printf("tftproot: bootfile=%s\n", nd->nd_bootfile);
 
-	bzero(&trh, sizeof(trh));
+	memset(&trh, 0, sizeof(trh));
 	trh.trh_nd = nd;
 	trh.trh_block = 1;
 
Index: sys/lib/libz/zalloc.c
===================================================================
RCS file: /cvsroot/src/sys/lib/libz/zalloc.c,v
retrieving revision 1.6
diff -u -p -r1.6 zalloc.c
--- sys/lib/libz/zalloc.c	28 Apr 2008 20:24:06 -0000	1.6
+++ sys/lib/libz/zalloc.c	19 Dec 2008 18:58:28 -0000
@@ -46,7 +46,7 @@ zcalloc(voidpf opaque, unsigned int item
 	totalsize = items * size;
 	opaque = alloc(totalsize);
 	if (opaque != NULL)
-		bzero(opaque, totalsize);
+		memset(opaque, 0, totalsize);
 	return opaque;
 }
 
Index: sys/net/if_ecosubr.c
===================================================================
RCS file: /cvsroot/src/sys/net/if_ecosubr.c,v
retrieving revision 1.30
diff -u -p -r1.30 if_ecosubr.c
--- sys/net/if_ecosubr.c	17 Dec 2008 20:51:36 -0000	1.30
+++ sys/net/if_ecosubr.c	19 Dec 2008 18:58:28 -0000
@@ -415,7 +415,7 @@ eco_input(struct ifnet *ifp, struct mbuf
 			m1->m_pkthdr.len = m1->m_len;
 			MH_ALIGN(m1, m1->m_len);
 			ah = mtod(m1, struct arphdr *);
-			bzero((void *)ah, m1->m_len);
+			memset((void *)ah, 0, m1->m_len);
 			ah->ar_pro = htons(ETHERTYPE_IP);
 			ah->ar_hln = ifp->if_data.ifi_addrlen;
 			ah->ar_pln = sizeof(struct in_addr);
Index: sys/net/if_srt.c
===================================================================
RCS file: /cvsroot/src/sys/net/if_srt.c,v
retrieving revision 1.9
diff -u -p -r1.9 if_srt.c
--- sys/net/if_srt.c	7 Nov 2008 00:20:13 -0000	1.9
+++ sys/net/if_srt.c	19 Dec 2008 18:58:28 -0000
@@ -234,7 +234,7 @@ static int srt_clone_create(struct if_cl
  if ((unit < 0) || (unit > SRT_MAXUNIT)) return(ENXIO);
  if (softcv[unit]) return(EBUSY);
  sc = malloc(sizeof(SOFTC),M_DEVBUF,M_WAIT);
- bzero(&sc->intf,sizeof(sc->intf)); /* XXX */
+ memset(&sc->intf, 0,sizeof(sc->intf)); /* XXX */
  sc->unit = unit;
  sc->nrt = 0;
  sc->rts = 0;
Index: sys/net80211/ieee80211_ioctl.c
===================================================================
RCS file: /cvsroot/src/sys/net80211/ieee80211_ioctl.c,v
retrieving revision 1.51
diff -u -p -r1.51 ieee80211_ioctl.c
--- sys/net80211/ieee80211_ioctl.c	17 Dec 2008 20:51:37 -0000	1.51
+++ sys/net80211/ieee80211_ioctl.c	19 Dec 2008 18:58:28 -0000
@@ -1366,7 +1366,7 @@ ieee80211_ioctl_get80211_fbsd(struct iee
 		    NULL) == 0) {
 			bcopy(ic->ic_nw_keys[kid].wk_key, tmpkey, len);
 		} else {
-			bzero(tmpkey, len);
+			memset(tmpkey, 0, len);
 		}
 		ireq->i_len = len;
 		error = copyout(tmpkey, ireq->i_data, len);
Index: sys/netatalk/aarp.c
===================================================================
RCS file: /cvsroot/src/sys/netatalk/aarp.c,v
retrieving revision 1.27
diff -u -p -r1.27 aarp.c
--- sys/netatalk/aarp.c	24 Apr 2008 11:38:37 -0000	1.27
+++ sys/netatalk/aarp.c	19 Dec 2008 18:58:29 -0000
@@ -175,7 +175,7 @@ aarpwhohas(ifp, sat)
 	MH_ALIGN(m, sizeof(*ea));
 
 	ea = mtod(m, struct ether_aarp *);
-	bzero(ea, sizeof(*ea));
+	memset(ea, 0, sizeof(*ea));
 
 	ea->aarp_hrd = htons(AARPHRD_ETHER);
 	ea->aarp_pro = htons(ETHERTYPE_ATALK);
@@ -588,7 +588,7 @@ aarpprobe(arp)
 	MH_ALIGN(m, sizeof(*ea));
 
 	ea = mtod(m, struct ether_aarp *);
-	bzero(ea, sizeof(*ea));
+	memset(ea, 0, sizeof(*ea));
 
 	ea->aarp_hrd = htons(AARPHRD_ETHER);
 	ea->aarp_pro = htons(ETHERTYPE_ATALK);
Index: sys/netatalk/at_control.c
===================================================================
RCS file: /cvsroot/src/sys/netatalk/at_control.c,v
retrieving revision 1.27
diff -u -p -r1.27 at_control.c
--- sys/netatalk/at_control.c	7 Nov 2008 00:20:18 -0000	1.27
+++ sys/netatalk/at_control.c	19 Dec 2008 18:58:29 -0000
@@ -406,7 +406,7 @@ at_ifinit(ifp, aa, sat)
          * at_ifnet (also given). Remember ing to update
          * those parts of the at_ifaddr that need special processing
          */
-	bzero(AA_SAT(aa), sizeof(struct sockaddr_at));
+	memset(AA_SAT(aa), 0, sizeof(struct sockaddr_at));
 	bcopy(sat->sat_zero, &nr, sizeof(struct netrange));
 	bcopy(sat->sat_zero, AA_SAT(aa)->sat_zero, sizeof(struct netrange));
 	nnets = ntohs(nr.nr_lastnet) - ntohs(nr.nr_firstnet) + 1;
@@ -600,7 +600,7 @@ at_ifinit(ifp, aa, sat)
 	 * pointer in the ifaddr to it. probably pointless, but what the
 	 * heck.. XXX
 	 */
-	bzero(&aa->aa_netmask, sizeof(aa->aa_netmask));
+	memset(&aa->aa_netmask, 0, sizeof(aa->aa_netmask));
 	aa->aa_netmask.sat_len = sizeof(struct sockaddr_at);
 	aa->aa_netmask.sat_family = AF_APPLETALK;
 	aa->aa_netmask.sat_addr.s_net = 0xffff;
@@ -612,7 +612,7 @@ at_ifinit(ifp, aa, sat)
 	/*
          * Initialize broadcast (or remote p2p) address
          */
-	bzero(&aa->aa_broadaddr, sizeof(aa->aa_broadaddr));
+	memset(&aa->aa_broadaddr, 0, sizeof(aa->aa_broadaddr));
 	aa->aa_broadaddr.sat_len = sizeof(struct sockaddr_at);
 	aa->aa_broadaddr.sat_family = AF_APPLETALK;
 
@@ -628,16 +628,16 @@ at_ifinit(ifp, aa, sat)
 	} else if (ifp->if_flags & IFF_POINTOPOINT) {
 		struct at_addr  rtaddr, rtmask;
 
-		bzero(&rtaddr, sizeof(rtaddr));
-		bzero(&rtmask, sizeof(rtmask));
+		memset(&rtaddr, 0, sizeof(rtaddr));
+		memset(&rtmask, 0, sizeof(rtmask));
 		/* fill in the far end if we know it here XXX */
 		aa->aa_ifa.ifa_dstaddr = (struct sockaddr *) & aa->aa_dstaddr;
 		error = aa_addsingleroute(&aa->aa_ifa, &rtaddr, &rtmask);
 	} else if (ifp->if_flags & IFF_LOOPBACK) {
 		struct at_addr  rtaddr, rtmask;
 
-		bzero(&rtaddr, sizeof(rtaddr));
-		bzero(&rtmask, sizeof(rtmask));
+		memset(&rtaddr, 0, sizeof(rtaddr));
+		memset(&rtmask, 0, sizeof(rtmask));
 		rtaddr.s_net = AA_SAT(aa)->sat_addr.s_net;
 		rtaddr.s_node = AA_SAT(aa)->sat_addr.s_node;
 		rtmask.s_net = 0xffff;
@@ -816,8 +816,8 @@ aa_dosingleroute(ifa, at_addr, at_mask, 
 {
 	struct sockaddr_at addr, mask, *gate;
 
-	bzero(&addr, sizeof(addr));
-	bzero(&mask, sizeof(mask));
+	memset(&addr, 0, sizeof(addr));
+	memset(&mask, 0, sizeof(mask));
 	addr.sat_family = AF_APPLETALK;
 	addr.sat_len = sizeof(struct sockaddr_at);
 	addr.sat_addr.s_net = at_addr->s_net;
Index: sys/netatalk/ddp_input.c
===================================================================
RCS file: /cvsroot/src/sys/netatalk/ddp_input.c,v
retrieving revision 1.19
diff -u -p -r1.19 ddp_input.c
--- sys/netatalk/ddp_input.c	24 Apr 2008 11:38:37 -0000	1.19
+++ sys/netatalk/ddp_input.c	19 Dec 2008 18:58:29 -0000
@@ -153,7 +153,7 @@ ddp_input(m, ifp, elh, phase)
 		struct sockaddr_at	dsta;
 	} u;
 
-	bzero((void *) & from, sizeof(struct sockaddr_at));
+	memset((void *) & from, 0, sizeof(struct sockaddr_at));
 	if (elh) {
 		DDP_STATINC(DDP_STAT_SHORT);
 
@@ -346,8 +346,8 @@ bprint(data, len)
 	char            xout[BPXLEN], aout[BPALEN];
 	int             i = 0;
 
-	bzero(xout, BPXLEN);
-	bzero(aout, BPALEN);
+	memset(xout, 0, BPXLEN);
+	memset(aout, 0, BPALEN);
 
 	for (;;) {
 		if (len < 1) {
@@ -374,8 +374,8 @@ bprint(data, len)
 
 		if (i > BPALEN - 2) {
 			printf("%s\t%s\n", xout, aout);
-			bzero(xout, BPXLEN);
-			bzero(aout, BPALEN);
+			memset(xout, 0, BPXLEN);
+			memset(aout, 0, BPALEN);
 			i = 0;
 			continue;
 		}
Index: sys/netatalk/ddp_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/netatalk/ddp_usrreq.c,v
retrieving revision 1.34
diff -u -p -r1.34 ddp_usrreq.c
--- sys/netatalk/ddp_usrreq.c	17 Dec 2008 20:51:37 -0000	1.34
+++ sys/netatalk/ddp_usrreq.c	19 Dec 2008 18:58:29 -0000
@@ -284,7 +284,7 @@ at_pcbsetaddr(ddp, addr, l)
 				return (EACCES);
 		}
 	} else {
-		bzero((void *) & lsat, sizeof(struct sockaddr_at));
+		memset((void *) & lsat, 0, sizeof(struct sockaddr_at));
 		lsat.sat_len = sizeof(struct sockaddr_at);
 		lsat.sat_addr.s_node = ATADDR_ANYNODE;
 		lsat.sat_addr.s_net = ATADDR_ANYNET;
Index: sys/netinet/in.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/in.c,v
retrieving revision 1.129
diff -u -p -r1.129 in.c
--- sys/netinet/in.c	17 Dec 2008 20:51:37 -0000	1.129
+++ sys/netinet/in.c	19 Dec 2008 18:58:29 -0000
@@ -295,7 +295,7 @@ in_len2mask(struct in_addr *mask, u_int 
 	u_char *p;
 
 	p = (u_char *)mask;
-	bzero(mask, sizeof(*mask));
+	memset(mask, 0, sizeof(*mask));
 	for (i = 0; i < len / NBBY; i++)
 		p[i] = 0xff;
 	if (len % NBBY)
@@ -673,7 +673,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 			return EINVAL;
 
 		/* copy args to in_aliasreq, perform ioctl(SIOCAIFADDR). */
-		bzero(&ifra, sizeof(ifra));
+		memset(&ifra, 0, sizeof(ifra));
 		bcopy(iflr->iflr_name, ifra.ifra_name,
 			sizeof(ifra.ifra_name));
 
@@ -699,8 +699,8 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 		struct sockaddr_in *sin;
 		int cmp;
 
-		bzero(&mask, sizeof(mask));
-		bzero(&match, sizeof(match));	/* XXX gcc */
+		memset(&mask, 0, sizeof(mask));
+		memset(&match, 0, sizeof(match));	/* XXX gcc */
 		if (iflr->flags & IFLR_PREFIX) {
 			/* lookup a prefix rather than address. */
 			in_len2mask(&mask, iflr->prefixlen);
@@ -750,7 +750,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 				bcopy(&ia->ia_dstaddr, &iflr->dstaddr,
 					ia->ia_dstaddr.sin_len);
 			} else
-				bzero(&iflr->dstaddr, sizeof(iflr->dstaddr));
+				memset(&iflr->dstaddr, 0, sizeof(iflr->dstaddr));
 
 			iflr->prefixlen =
 				in_mask2len(&ia->ia_sockmask.sin_addr);
@@ -762,7 +762,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 			struct in_aliasreq ifra;
 
 			/* fill in_aliasreq and do ioctl(SIOCDIFADDR) */
-			bzero(&ifra, sizeof(ifra));
+			memset(&ifra, 0, sizeof(ifra));
 			bcopy(iflr->iflr_name, ifra.ifra_name,
 				sizeof(ifra.ifra_name));
 
Index: sys/netinet/in_pcb.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/in_pcb.c,v
retrieving revision 1.129
diff -u -p -r1.129 in_pcb.c
--- sys/netinet/in_pcb.c	11 Oct 2008 13:40:57 -0000	1.129
+++ sys/netinet/in_pcb.c	19 Dec 2008 18:58:29 -0000
@@ -197,7 +197,7 @@ in_pcballoc(struct socket *so, void *v)
 	splx(s);
 	if (inp == NULL)
 		return (ENOBUFS);
-	bzero((void *)inp, sizeof(*inp));
+	memset((void *)inp, 0, sizeof(*inp));
 	inp->inp_af = AF_INET;
 	inp->inp_table = table;
 	inp->inp_socket = so;
Index: sys/netinet/ip_carp.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/ip_carp.c,v
retrieving revision 1.29
diff -u -p -r1.29 ip_carp.c
--- sys/netinet/ip_carp.c	19 Dec 2008 18:49:39 -0000	1.29
+++ sys/netinet/ip_carp.c	19 Dec 2008 18:58:29 -0000
@@ -243,7 +243,7 @@ carp_hmac_prepare(struct carp_softc *sc)
 #endif /* INET6 */
 
 	/* compute ipad from key */
-	bzero(sc->sc_pad, sizeof(sc->sc_pad));
+	memset(sc->sc_pad, 0, sizeof(sc->sc_pad));
 	bcopy(sc->sc_key, sc->sc_pad, sizeof(sc->sc_key));
 	for (i = 0; i < sizeof(sc->sc_pad); i++)
 		sc->sc_pad[i] ^= 0x36;
@@ -614,7 +614,7 @@ carp_proto_input_c(struct mbuf *m, struc
 		struct sockaddr sa;
 		struct ifaddr *ifa;
 
-		bzero(&sa, sizeof(sa));
+		memset(&sa, 0, sizeof(sa));
 		sa.sa_family = af;
 		ifa = ifaof_ifpforaddr(&sa, sc->sc_carpdev);
 
@@ -985,7 +985,7 @@ carp_send_ad(void *v)
 		ip->ip_p = IPPROTO_CARP;
 		ip->ip_sum = 0;
 
-		bzero(&sa, sizeof(sa));
+		memset(&sa, 0, sizeof(sa));
 		sa.sa_family = AF_INET;
 		ifa = ifaof_ifpforaddr(&sa, sc->sc_carpdev);
 		if (ifa == NULL)
@@ -1055,17 +1055,17 @@ carp_send_ad(void *v)
 		MH_ALIGN(m, m->m_len);
 		m->m_flags |= M_MCAST;
 		ip6 = mtod(m, struct ip6_hdr *);
-		bzero(ip6, sizeof(*ip6));
+		memset(ip6, 0, sizeof(*ip6));
 		ip6->ip6_vfc |= IPV6_VERSION;
 		ip6->ip6_hlim = CARP_DFLTTL;
 		ip6->ip6_nxt = IPPROTO_CARP;
 
 		/* set the source address */
-		bzero(&sa, sizeof(sa));
+		memset(&sa, 0, sizeof(sa));
 		sa.sa_family = AF_INET6;
 		ifa = ifaof_ifpforaddr(&sa, sc->sc_carpdev);
 		if (ifa == NULL)	/* This should never happen with IPv6 */
-			bzero(&ip6->ip6_src, sizeof(struct in6_addr));
+			memset(&ip6->ip6_src, 0, sizeof(struct in6_addr));
 		else
 			bcopy(ifatoia6(ifa)->ia_addr.sin6_addr.s6_addr,
 			    &ip6->ip6_src, sizeof(struct in6_addr));
@@ -1637,7 +1637,7 @@ carp_addr_updated(void *v)
 		mc_addr.s_addr = INADDR_CARP_GROUP;
 		IN_LOOKUP_MULTI(mc_addr, &sc->sc_if, inm);
 		if (inm == NULL) {
-			bzero(&sc->sc_imo, sizeof(sc->sc_imo));
+			memset(&sc->sc_imo, 0, sizeof(sc->sc_imo));
 
 			if (sc->sc_carpdev != NULL && sc->sc_naddrs > 0)
 				carp_join_multicast(sc);
@@ -1728,7 +1728,7 @@ carp_join_multicast(struct carp_softc *s
 	struct ip_moptions *imo = &sc->sc_imo, tmpimo;
 	struct in_addr addr;
 
-	bzero(&tmpimo, sizeof(tmpimo));
+	memset(&tmpimo, 0, sizeof(tmpimo));
 	addr.s_addr = INADDR_CARP_GROUP;
 	if ((tmpimo.imo_membership[0] =
 	    in_addmulti(&addr, &sc->sc_if)) == NULL) {
@@ -1820,7 +1820,7 @@ carp_join_multicast6(struct carp_softc *
 	int error;
 
 	/* Join IPv6 CARP multicast group */
-	bzero(&addr6, sizeof(addr6));
+	memset(&addr6, 0, sizeof(addr6));
 	addr6.sin6_family = AF_INET6;
 	addr6.sin6_len = sizeof(addr6);
 	addr6.sin6_addr.s6_addr16[0] = htons(0xff02);
@@ -1831,7 +1831,7 @@ carp_join_multicast6(struct carp_softc *
 		return (error);
 	}
 	/* join solicited multicast address */
-	bzero(&addr6.sin6_addr, sizeof(addr6.sin6_addr));
+	memset(&addr6.sin6_addr, 0, sizeof(addr6.sin6_addr));
 	addr6.sin6_addr.s6_addr16[0] = htons(0xff02);
 	addr6.sin6_addr.s6_addr16[1] = htons(sc->sc_if.if_index);
 	addr6.sin6_addr.s6_addr32[1] = 0;
@@ -1989,7 +1989,7 @@ carp_ioctl(struct ifnet *ifp, u_long cmd
 		break;
 
 	case SIOCGVH:
-		bzero(&carpr, sizeof(carpr));
+		memset(&carpr, 0, sizeof(carpr));
 		if (sc->sc_carpdev != NULL)
 			strlcpy(carpr.carpr_carpdev, sc->sc_carpdev->if_xname,
 			    IFNAMSIZ);
Index: sys/netinet/ip_encap.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/ip_encap.c,v
retrieving revision 1.33
diff -u -p -r1.33 ip_encap.c
--- sys/netinet/ip_encap.c	25 Nov 2008 18:28:05 -0000	1.33
+++ sys/netinet/ip_encap.c	19 Dec 2008 18:58:29 -0000
@@ -192,7 +192,7 @@ encap4_lookup(struct mbuf *m, int off, i
 #endif
 	ip = mtod(m, struct ip *);
 
-	bzero(&pack, sizeof(pack));
+	memset(&pack, 0, sizeof(pack));
 	pack.p.sp_len = sizeof(pack);
 	pack.mine.sin_family = pack.yours.sin_family = AF_INET;
 	pack.mine.sin_len = pack.yours.sin_len = sizeof(struct sockaddr_in);
@@ -316,7 +316,7 @@ encap6_lookup(struct mbuf *m, int off, i
 #endif
 	ip6 = mtod(m, struct ip6_hdr *);
 
-	bzero(&pack, sizeof(pack));
+	memset(&pack, 0, sizeof(pack));
 	pack.p.sp_len = sizeof(pack);
 	pack.mine.sin6_family = pack.yours.sin6_family = AF_INET6;
 	pack.mine.sin6_len = pack.yours.sin6_len = sizeof(struct sockaddr_in6);
@@ -633,7 +633,7 @@ encap_attach_func(int af, int proto,
 		error = ENOBUFS;
 		goto fail;
 	}
-	bzero(ep, sizeof(*ep));
+	memset(ep, 0, sizeof(*ep));
 
 	ep->af = af;
 	ep->proto = proto;
Index: sys/netinet/ip_mroute.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/ip_mroute.c,v
retrieving revision 1.117
diff -u -p -r1.117 ip_mroute.c
--- sys/netinet/ip_mroute.c	19 Dec 2008 18:49:39 -0000	1.117
+++ sys/netinet/ip_mroute.c	19 Dec 2008 18:58:30 -0000
@@ -630,7 +630,7 @@ ip_mrouter_init(struct socket *so, int v
 	ip_mrouter = so;
 
 	mfchashtbl = hashinit(MFCTBLSIZ, HASH_LIST, true, &mfchash);
-	bzero((void *)nexpire, sizeof(nexpire));
+	memset((void *)nexpire, 0, sizeof(nexpire));
 
 	pim_assert = 0;
 
@@ -693,12 +693,12 @@ ip_mrouter_done(void)
 		}
 	}
 
-	bzero((void *)nexpire, sizeof(nexpire));
+	memset((void *)nexpire, 0, sizeof(nexpire));
 	hashdone(mfchashtbl, HASH_LIST, mfchash);
 	mfchashtbl = NULL;
 
 	bw_upcalls_n = 0;
-	bzero(bw_meter_timers, sizeof(bw_meter_timers));
+	memset(bw_meter_timers, 0, sizeof(bw_meter_timers));
 
 	/* Reset de-encapsulation cache. */
 
@@ -846,7 +846,7 @@ add_vif(struct vifctl *vifcp)
 			 "mdecap%d", vifcp->vifc_vifi);
 
 		/* Prepare cached route entry. */
-		bzero(&vifp->v_route, sizeof(vifp->v_route));
+		memset(&vifp->v_route, 0, sizeof(vifp->v_route));
 #ifdef PIM
 	} else if (vifcp->vifc_flags & VIFF_REGISTER) {
 		ifp = &multicast_register_if;
@@ -854,11 +854,11 @@ add_vif(struct vifctl *vifcp)
 			log(LOG_DEBUG, "Adding a register vif, ifp: %p\n",
 			    (void *)ifp);
 		if (reg_vif_num == VIFI_INVALID) {
-			bzero(ifp, sizeof(*ifp));
+			memset(ifp, 0, sizeof(*ifp));
 			snprintf(ifp->if_xname, sizeof(ifp->if_xname),
 				 "register_vif");
 			ifp->if_flags = IFF_LOOPBACK;
-			bzero(&vifp->v_route, sizeof(vifp->v_route));
+			memset(&vifp->v_route, 0, sizeof(vifp->v_route));
 			reg_vif_num = vifcp->vifc_vifi;
 		}
 #endif
@@ -957,7 +957,7 @@ reset_vif(struct vif *vifp)
 		ifp = vifp->v_ifp;
 		(*ifp->if_ioctl)(ifp, SIOCDELMULTI, &ifr);
 	}
-	bzero((void *)vifp, sizeof(*vifp));
+	memset((void *)vifp, 0, sizeof(*vifp));
 }
 
 /*
Index: sys/netinet/ip_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/ip_output.c,v
retrieving revision 1.200
diff -u -p -r1.200 ip_output.c
--- sys/netinet/ip_output.c	12 Oct 2008 11:15:54 -0000	1.200
+++ sys/netinet/ip_output.c	19 Dec 2008 18:58:31 -0000
@@ -575,7 +575,7 @@ sendit:
 
     {
 	struct ipsec_output_state state;
-	bzero(&state, sizeof(state));
+	memset(&state, 0, sizeof(state));
 	state.m = m;
 	if (flags & IP_ROUTETOIF) {
 		state.ro = &iproute;
Index: sys/netinet/tcp_debug.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/tcp_debug.c,v
retrieving revision 1.25
diff -u -p -r1.25 tcp_debug.c
--- sys/netinet/tcp_debug.c	4 Mar 2007 06:03:21 -0000	1.25
+++ sys/netinet/tcp_debug.c	19 Dec 2008 18:58:31 -0000
@@ -127,11 +127,11 @@ tcp_trace(short act, short ostate, struc
 	if (tp)
 		td->td_cb = *tp;
 	else
-		bzero((void *)&td->td_cb, sizeof (*tp));
+		memset((void *)&td->td_cb, 0, sizeof (*tp));
 	td->td_family = tp->t_family;
-	bzero((void *)&td->td_ti, sizeof (td->td_ti));
+	memset((void *)&td->td_ti, 0, sizeof (td->td_ti));
 #ifdef INET6
-	bzero((void *)&td->td_ti6, sizeof (td->td_ti6));
+	memset((void *)&td->td_ti6, 0, sizeof (td->td_ti6));
 #endif
 	th = NULL;
 	if (m) {
Index: sys/netinet/tcp_input.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/tcp_input.c,v
retrieving revision 1.291
diff -u -p -r1.291 tcp_input.c
--- sys/netinet/tcp_input.c	4 Aug 2008 04:08:47 -0000	1.291
+++ sys/netinet/tcp_input.c	19 Dec 2008 18:58:32 -0000
@@ -1020,7 +1020,7 @@ tcp_input(struct mbuf *m, ...)
 
 	TCP_STATINC(TCP_STAT_RCVTOTAL);
 
-	bzero(&opti, sizeof(opti));
+	memset(&opti, 0, sizeof(opti));
 	opti.ts_present = 0;
 	opti.maxseg = 0;
 
@@ -1198,10 +1198,10 @@ findpcb:
 			struct in6_addr s, d;
 
 			/* mapped addr case */
-			bzero(&s, sizeof(s));
+			memset(&s, 0, sizeof(s));
 			s.s6_addr16[5] = htons(0xffff);
 			bcopy(&ip->ip_src, &s.s6_addr32[3], sizeof(ip->ip_src));
-			bzero(&d, sizeof(d));
+			memset(&d, 0, sizeof(d));
 			d.s6_addr16[5] = htons(0xffff);
 			bcopy(&ip->ip_dst, &d.s6_addr32[3], sizeof(ip->ip_dst));
 			in6p = in6_pcblookup_connect(&tcbtable, &s,
@@ -1340,8 +1340,8 @@ findpcb:
 		union syn_cache_sa src;
 		union syn_cache_sa dst;
 
-		bzero(&src, sizeof(src));
-		bzero(&dst, sizeof(dst));
+		memset(&src, 0, sizeof(src));
+		memset(&dst, 0, sizeof(dst));
 		switch (af) {
 #ifdef INET
 		case AF_INET:
@@ -2867,7 +2867,7 @@ tcp_signature_getsav(struct mbuf *m, str
 
 #ifdef FAST_IPSEC
 	/* Extract the destination from the IP header in the mbuf. */
-	bzero(&dst, sizeof(union sockaddr_union));
+	memset(&dst, 0, sizeof(union sockaddr_union));
 	if (ip !=NULL) {
 		dst.sa.sa_len = sizeof(struct sockaddr_in);
 		dst.sa.sa_family = AF_INET;
@@ -3681,7 +3681,7 @@ syn_cache_get(struct sockaddr *src, stru
 #ifdef INET6
 		else if (in6p) {
 			/* IPv4 packet to AF_INET6 socket */
-			bzero(&in6p->in6p_laddr, sizeof(in6p->in6p_laddr));
+			memset(&in6p->in6p_laddr, 0, sizeof(in6p->in6p_laddr));
 			in6p->in6p_laddr.s6_addr16[5] = htons(0xffff);
 			bcopy(&((struct sockaddr_in *)dst)->sin_addr,
 				&in6p->in6p_laddr.s6_addr32[3],
@@ -3774,7 +3774,7 @@ syn_cache_get(struct sockaddr *src, stru
 			struct sockaddr_in6 *sin6;
 			sin6 = mtod(am, struct sockaddr_in6 *);
 			am->m_len = sizeof(*sin6);
-			bzero(sin6, sizeof(*sin6));
+			memset(sin6, 0, sizeof(*sin6));
 			sin6->sin6_family = AF_INET6;
 			sin6->sin6_len = sizeof(*sin6);
 			sin6->sin6_port = ((struct sockaddr_in *)src)->sin_port;
@@ -4000,7 +4000,7 @@ syn_cache_add(struct sockaddr *src, stru
 
 	tp = sototcpcb(so);
 
-	bzero(&opti, sizeof(opti));
+	memset(&opti, 0, sizeof(opti));
 
 	/*
 	 * RFC1122 4.2.3.10, p. 104: discard bcast/mcast SYN
@@ -4084,7 +4084,7 @@ syn_cache_add(struct sockaddr *src, stru
 	 * Fill in the cache, and put the necessary IP and TCP
 	 * options into the reply.
 	 */
-	bzero(sc, sizeof(struct syn_cache));
+	memset(sc, 0, sizeof(struct syn_cache));
 	callout_init(&sc->sc_timer, CALLOUT_MPSAFE);
 	bcopy(src, &sc->sc_src, src->sa_len);
 	bcopy(dst, &sc->sc_dst, dst->sa_len);
@@ -4406,7 +4406,7 @@ syn_cache_respond(struct syn_cache *sc, 
 		*optp++ = TCPOPT_SIGNATURE;
 		*optp++ = TCPOLEN_SIGNATURE;
 		sigp = optp;
-		bzero(optp, TCP_SIGLEN);
+		memset(optp, 0, TCP_SIGLEN);
 		optp += TCP_SIGLEN;
 		*optp++ = TCPOPT_NOP;
 		*optp++ = TCPOPT_EOL;
Index: sys/netinet/tcp_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/tcp_output.c,v
retrieving revision 1.167
diff -u -p -r1.167 tcp_output.c
--- sys/netinet/tcp_output.c	28 Apr 2008 20:24:09 -0000	1.167
+++ sys/netinet/tcp_output.c	19 Dec 2008 18:58:32 -0000
@@ -1220,7 +1220,7 @@ send:
 		*bp++ = TCPOPT_SIGNATURE;
 		*bp++ = TCPOLEN_SIGNATURE;
 		sigoff = optlen + 2;
-		bzero(bp, TCP_SIGLEN);
+		memset(bp, 0, TCP_SIGLEN);
 		bp += TCP_SIGLEN;
 		optlen += TCPOLEN_SIGNATURE;
 		/*
Index: sys/netinet/tcp_subr.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/tcp_subr.c,v
retrieving revision 1.233
diff -u -p -r1.233 tcp_subr.c
--- sys/netinet/tcp_subr.c	13 Oct 2008 19:44:21 -0000	1.233
+++ sys/netinet/tcp_subr.c	19 Dec 2008 18:58:33 -0000
@@ -487,7 +487,7 @@ tcp_template(struct tcpcb *tp)
 		m->m_pkthdr.len = m->m_len = hlen + sizeof(struct tcphdr);
 	}
 
-	bzero(mtod(m, void *), m->m_len);
+	memset(mtod(m, void *), 0, m->m_len);
 
 	n = (struct tcphdr *)(mtod(m, char *) + hlen);
 
@@ -819,7 +819,7 @@ tcp_respond(struct tcpcb *tp, struct mbu
 	case AF_INET:
 	    {
 		struct ipovly *ipov = (struct ipovly *)ip;
-		bzero(ipov->ih_x1, sizeof ipov->ih_x1);
+		memset(ipov->ih_x1, 0, sizeof ipov->ih_x1);
 		ipov->ih_len = htons((u_int16_t)tlen);
 
 		th->th_sum = 0;
@@ -1452,7 +1452,7 @@ tcp6_ctlinput(int cmd, const struct sock
 			return NULL;
 		}
 
-		bzero(&th, sizeof(th));
+		memset(&th, 0, sizeof(th));
 		m_copydata(m, off, sizeof(th), (void *)&th);
 
 		if (cmd == PRC_MSGSIZE) {
@@ -1638,7 +1638,7 @@ tcp_ctlinput(int cmd, const struct socka
 		    inetctlerrmap[cmd] == ENETUNREACH ||
 		    inetctlerrmap[cmd] == EHOSTDOWN)) {
 			struct sockaddr_in sin;
-			bzero(&sin, sizeof(sin));
+			memset(&sin, 0, sizeof(sin));
 			sin.sin_len = sizeof(sin);
 			sin.sin_family = AF_INET;
 			sin.sin_port = th->th_sport;
@@ -1757,7 +1757,7 @@ tcp6_mtudisc_callback(struct in6_addr *f
 {
 	struct sockaddr_in6 sin6;
 
-	bzero(&sin6, sizeof(sin6));
+	memset(&sin6, 0, sizeof(sin6));
 	sin6.sin6_family = AF_INET6;
 	sin6.sin6_len = sizeof(struct sockaddr_in6);
 	sin6.sin6_addr = *faddr;
Index: sys/netinet/udp_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.173
diff -u -p -r1.173 udp_usrreq.c
--- sys/netinet/udp_usrreq.c	6 Aug 2008 15:01:23 -0000	1.173
+++ sys/netinet/udp_usrreq.c	19 Dec 2008 18:58:33 -0000
@@ -408,14 +408,14 @@ udp_input(struct mbuf *m, ...)
 	if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) {
 		struct sockaddr_in6 src6, dst6;
 
-		bzero(&src6, sizeof(src6));
+		memset(&src6, 0, sizeof(src6));
 		src6.sin6_family = AF_INET6;
 		src6.sin6_len = sizeof(struct sockaddr_in6);
 		src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff;
 		bcopy(&ip->ip_src, &src6.sin6_addr.s6_addr[12],
 			sizeof(ip->ip_src));
 		src6.sin6_port = uh->uh_sport;
-		bzero(&dst6, sizeof(dst6));
+		memset(&dst6, 0, sizeof(dst6));
 		dst6.sin6_family = AF_INET6;
 		dst6.sin6_len = sizeof(struct sockaddr_in6);
 		dst6.sin6_addr.s6_addr[10] = dst6.sin6_addr.s6_addr[11] = 0xff;
@@ -575,12 +575,12 @@ udp6_input(struct mbuf **mp, int *offp, 
 	/*
 	 * Construct source and dst sockaddrs.
 	 */
-	bzero(&src, sizeof(src));
+	memset(&src, 0, sizeof(src));
 	src.sin6_family = AF_INET6;
 	src.sin6_len = sizeof(struct sockaddr_in6);
 	src.sin6_addr = ip6->ip6_src;
 	src.sin6_port = uh->uh_sport;
-	bzero(&dst, sizeof(dst));
+	memset(&dst, 0, sizeof(dst));
 	dst.sin6_family = AF_INET6;
 	dst.sin6_len = sizeof(struct sockaddr_in6);
 	dst.sin6_addr = ip6->ip6_dst;
Index: sys/netinet6/ah_core.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ah_core.c,v
retrieving revision 1.44
diff -u -p -r1.44 ah_core.c
--- sys/netinet6/ah_core.c	23 May 2007 17:15:00 -0000	1.44
+++ sys/netinet6/ah_core.c	19 Dec 2008 18:58:34 -0000
@@ -336,7 +336,7 @@ ah_keyed_md5_init(struct ah_algorithm_st
 		MD5Update((MD5_CTX *)state->foo, &buf[0], 1);
 		padlen--;
 
-		bzero(buf, sizeof(buf));
+		memset(buf, 0, sizeof(buf));
 		while (sizeof(buf) < padlen) {
 			MD5Update((MD5_CTX *)state->foo, &buf[0], sizeof(buf));
 			padlen -= sizeof(buf);
@@ -421,7 +421,7 @@ ah_keyed_sha1_init(struct ah_algorithm_s
 		SHA1Update(ctxt, &buf[0], 1);
 		padlen--;
 
-		bzero(buf, sizeof(buf));
+		memset(buf, 0, sizeof(buf));
 		while (sizeof(buf) < padlen) {
 			SHA1Update(ctxt, &buf[0], sizeof(buf));
 			padlen -= sizeof(buf);
@@ -510,8 +510,8 @@ ah_hmac_md5_init(struct ah_algorithm_sta
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -602,8 +602,8 @@ ah_hmac_sha1_init(struct ah_algorithm_st
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -684,7 +684,7 @@ ah_hmac_sha2_256_init(struct ah_algorith
 
 	/* compress the key if necessery */
 	if (64 < _KEYLEN(state->sav->key_auth)) {
-		bzero(tk, sizeof(tk));
+		memset(tk, 0, sizeof(tk));
 		SHA256_Init(ctxt);
 		SHA256_Update(ctxt, _KEYBUF(state->sav->key_auth),
 		    _KEYLEN(state->sav->key_auth));
@@ -696,8 +696,8 @@ ah_hmac_sha2_256_init(struct ah_algorith
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -771,7 +771,7 @@ ah_hmac_sha2_384_init(struct ah_algorith
 	    M_TEMP, M_NOWAIT);
 	if (!state->foo)
 		return ENOBUFS;
-	bzero(state->foo, 64 + 64 + sizeof(SHA384_CTX));
+	memset(state->foo, 0, 64 + 64 + sizeof(SHA384_CTX));
 
 	ipad = (u_char *)state->foo;
 	opad = (u_char *)(ipad + 64);
@@ -779,7 +779,7 @@ ah_hmac_sha2_384_init(struct ah_algorith
 
 	/* compress the key if necessery */
 	if (64 < _KEYLEN(state->sav->key_auth)) {
-		bzero(tk, sizeof(tk));
+		memset(tk, 0, sizeof(tk));
 		SHA384_Init(ctxt);
 		SHA384_Update(ctxt, _KEYBUF(state->sav->key_auth),
 		    _KEYLEN(state->sav->key_auth));
@@ -791,8 +791,8 @@ ah_hmac_sha2_384_init(struct ah_algorith
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -866,7 +866,7 @@ ah_hmac_sha2_512_init(struct ah_algorith
 	    M_TEMP, M_NOWAIT);
 	if (!state->foo)
 		return ENOBUFS;
-	bzero(state->foo, 64 + 64 + sizeof(SHA512_CTX));
+	memset(state->foo, 0, 64 + 64 + sizeof(SHA512_CTX));
 
 	ipad = (u_char *)state->foo;
 	opad = (u_char *)(ipad + 64);
@@ -874,7 +874,7 @@ ah_hmac_sha2_512_init(struct ah_algorith
 
 	/* compress the key if necessery */
 	if (64 < _KEYLEN(state->sav->key_auth)) {
-		bzero(tk, sizeof(tk));
+		memset(tk, 0, sizeof(tk));
 		SHA512_Init(ctxt);
 		SHA512_Update(ctxt, _KEYBUF(state->sav->key_auth),
 		    _KEYLEN(state->sav->key_auth));
@@ -886,8 +886,8 @@ ah_hmac_sha2_512_init(struct ah_algorith
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -961,7 +961,7 @@ ah_hmac_ripemd160_init(struct ah_algorit
 	    M_TEMP, M_NOWAIT);
 	if (!state->foo)
 		return ENOBUFS;
-	bzero(state->foo, 64 + 64 + sizeof(RMD160_CTX));
+	memset(state->foo, 0, 64 + 64 + sizeof(RMD160_CTX));
 
 	ipad = (u_char *)state->foo;
 	opad = (u_char *)(ipad + 64);
@@ -969,7 +969,7 @@ ah_hmac_ripemd160_init(struct ah_algorit
 
 	/* compress the key if necessery */
 	if (64 < _KEYLEN(state->sav->key_auth)) {
-		bzero(tk, sizeof(tk));
+		memset(tk, 0, sizeof(tk));
 		RMD160Init(ctxt);
 		RMD160Update(ctxt, _KEYBUF(state->sav->key_auth),
 		    _KEYLEN(state->sav->key_auth));
@@ -981,8 +981,8 @@ ah_hmac_ripemd160_init(struct ah_algorit
 		keylen = _KEYLEN(state->sav->key_auth);
 	}
 
-	bzero(ipad, 64);
-	bzero(opad, 64);
+	memset(ipad, 0, 64);
+	memset(opad, 0, 64);
 	bcopy(key, ipad, keylen);
 	bcopy(key, opad, keylen);
 	for (i = 0; i < 64; i++) {
@@ -1219,7 +1219,7 @@ again:
 					goto fail;
 				}
 				if (skip)
-					bzero(p + i, l);
+					memset(p + i, 0, l);
 				if (p[i + IPOPT_OPTVAL] == IPOPT_EOL)
 					break;
 				i += l;
@@ -1273,7 +1273,7 @@ again:
 			}
 			m_copydata(m, off, totlen, mtod(n, void *));
 			n->m_len = totlen;
-			bzero(mtod(n, u_int8_t *) + hdrsiz, siz);
+			memset(mtod(n, u_int8_t *) + hdrsiz, 0, siz);
 			(algo->update)(&algos, mtod(n, u_int8_t *), n->m_len);
 			m_free(n);
 			n = NULL;
@@ -1418,7 +1418,7 @@ ah6_calccksum(struct mbuf *m, u_int8_t *
 			}
 			m_copydata(m, off, newoff - off, mtod(n, void *));
 			n->m_len = newoff - off;
-			bzero(mtod(n, u_int8_t *) + hdrsiz, siz);
+			memset(mtod(n, u_int8_t *) + hdrsiz, 0, siz);
 			(algo->update)(&algos, mtod(n, u_int8_t *), n->m_len);
 			m_free(n);
 			n = NULL;
@@ -1493,7 +1493,7 @@ ah6_calccksum(struct mbuf *m, u_int8_t *
 			}
 
 			if (optp[0] & IP6OPT_MUTABLE)
-				bzero(optp + 2, optlen - 2);
+				memset(optp + 2, 0, optlen - 2);
 
 			optp += optlen;
 		}
Index: sys/netinet6/ah_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ah_output.c,v
retrieving revision 1.31
diff -u -p -r1.31 ah_output.c
--- sys/netinet6/ah_output.c	23 Apr 2008 06:09:05 -0000	1.31
+++ sys/netinet6/ah_output.c	19 Dec 2008 18:58:34 -0000
@@ -235,7 +235,7 @@ ah4_output(struct mbuf *m, struct ipsecr
 		ahdr->ah_nxt = ip->ip_p;
 		ahdr->ah_reserve = htons(0);
 		ahdr->ah_spi = spi;
-		bzero(ahdr + 1, plen);
+		memset(ahdr + 1, 0, plen);
 	} else {
 		struct newah *ahdr;
 
@@ -262,7 +262,7 @@ ah4_output(struct mbuf *m, struct ipsecr
 		 * installed by IKE daemon.
 		 */
 		ahdr->ah_seq = htonl(sav->replay->count & 0xffffffff);
-		bzero(ahdr + 1, plen);
+		memset(ahdr + 1, 0, plen);
 	}
 
 	/*
@@ -443,7 +443,7 @@ ah6_output(struct mbuf *m, u_char *nexth
 		ahdr->ah_len = plen >> 2;
 		ahdr->ah_reserve = htons(0);
 		ahdr->ah_spi = spi;
-		bzero(ahdr + 1, plen);
+		memset(ahdr + 1, 0, plen);
 	} else {
 		struct newah *ahdr = mtod(mah, struct newah *);
 
@@ -471,7 +471,7 @@ ah6_output(struct mbuf *m, u_char *nexth
 		 * installed by IKE daemon.
 		 */
 		ahdr->ah_seq = htonl(sav->replay->count);
-		bzero(ahdr + 1, plen);
+		memset(ahdr + 1, 0, plen);
 	}
 
 	/*
Index: sys/netinet6/esp_aesctr.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/esp_aesctr.c,v
retrieving revision 1.8
diff -u -p -r1.8 esp_aesctr.c
--- sys/netinet6/esp_aesctr.c	25 Dec 2007 18:33:47 -0000	1.8
+++ sys/netinet6/esp_aesctr.c	19 Dec 2008 18:58:34 -0000
@@ -273,8 +273,8 @@ esp_aesctr_decrypt(struct mbuf *m, size_
 	scut->m_next = d0;
 
 	/* just in case */
-	bzero(&cblock, sizeof(cblock));
-	bzero(keystream, sizeof(keystream));
+	memset(&cblock, 0, sizeof(cblock));
+	memset(keystream, 0, sizeof(keystream));
 
 	return 0;
 
@@ -450,8 +450,8 @@ esp_aesctr_encrypt(
 	scut->m_next = d0;
 
 	/* just in case */
-	bzero(&cblock, sizeof(cblock));
-	bzero(keystream, sizeof(keystream));
+	memset(&cblock, 0, sizeof(cblock));
+	memset(keystream, 0, sizeof(keystream));
 
 	key_sa_stir_iv(sav);
 
Index: sys/netinet6/esp_core.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/esp_core.c,v
retrieving revision 1.40
diff -u -p -r1.40 esp_core.c
--- sys/netinet6/esp_core.c	23 May 2007 17:15:00 -0000	1.40
+++ sys/netinet6/esp_core.c	19 Dec 2008 18:58:34 -0000
@@ -240,7 +240,7 @@ esp_schedule(const struct esp_algorithm 
 	if (error) {
 		ipseclog((LOG_ERR, "esp_schedule %s: error %d\n",
 		    algo->name, error));
-		bzero(sav->sched, sav->schedlen);
+		memset(sav->sched, 0, sav->schedlen);
 		free(sav->sched, M_SECA);
 		sav->sched = NULL;
 		sav->schedlen = 0;
@@ -769,8 +769,8 @@ esp_cbc_decrypt(struct mbuf *m, size_t o
 	scut->m_next = d0;
 
 	/* just in case */
-	bzero(iv, sizeof(iv));
-	bzero(sbuf, sizeof(sbuf));
+	memset(iv, 0, sizeof(iv));
+	memset(sbuf, 0, sizeof(sbuf));
 
 	return 0;
 }
@@ -976,8 +976,8 @@ esp_cbc_encrypt(
 	scut->m_next = d0;
 
 	/* just in case */
-	bzero(iv, sizeof(iv));
-	bzero(sbuf, sizeof(sbuf));
+	memset(iv, 0, sizeof(iv));
+	memset(sbuf, 0, sizeof(sbuf));
 
 	key_sa_stir_iv(sav);
 
Index: sys/netinet6/esp_input.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/esp_input.c,v
retrieving revision 1.47
diff -u -p -r1.47 esp_input.c
--- sys/netinet6/esp_input.c	24 Apr 2008 11:38:38 -0000	1.47
+++ sys/netinet6/esp_input.c	19 Dec 2008 18:58:34 -0000
@@ -941,7 +941,7 @@ esp6_ctlinput(int cmd, const struct sock
 		 * no possibility of an infinite loop of function calls,
 		 * because we don't pass the inner IPv6 header.
 		 */
-		bzero(&ip6cp1, sizeof(ip6cp1));
+		memset(&ip6cp1, 0, sizeof(ip6cp1));
 		ip6cp1.ip6c_src = ip6cp->ip6c_src;
 		pfctlinput2(cmd, sa, (void *)&ip6cp1);
 
Index: sys/netinet6/esp_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/esp_output.c,v
retrieving revision 1.32
diff -u -p -r1.32 esp_output.c
--- sys/netinet6/esp_output.c	23 Apr 2008 06:09:05 -0000	1.32
+++ sys/netinet6/esp_output.c	19 Dec 2008 18:58:35 -0000
@@ -509,7 +509,7 @@ esp_output(struct mbuf *m, u_char *nexth
 		key_randomfill(extend, extendsiz);
 		break;
 	case SADB_X_EXT_PZERO:
-		bzero(extend, extendsiz);
+		memset(extend, 0, extendsiz);
 		break;
 	case SADB_X_EXT_PSEQ:
 		for (i = 0; i < extendsiz; i++)
Index: sys/netinet6/frag6.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/frag6.c,v
retrieving revision 1.46
diff -u -p -r1.46 frag6.c
--- sys/netinet6/frag6.c	21 May 2008 17:08:07 -0000	1.46
+++ sys/netinet6/frag6.c	19 Dec 2008 18:58:35 -0000
@@ -266,7 +266,7 @@ frag6_input(struct mbuf **mp, int *offp,
 		    M_DONTWAIT);
 		if (q6 == NULL)
 			goto dropfrag;
-		bzero(q6, sizeof(*q6));
+		memset(q6, 0, sizeof(*q6));
 
 		frag6_insque(q6, &ip6q);
 
@@ -359,7 +359,7 @@ frag6_input(struct mbuf **mp, int *offp,
 	    M_DONTWAIT);
 	if (ip6af == NULL)
 		goto dropfrag;
-	bzero(ip6af, sizeof(*ip6af));
+	memset(ip6af, 0, sizeof(*ip6af));
 	ip6af->ip6af_head = ip6->ip6_flow;
 	ip6af->ip6af_len = ip6->ip6_plen;
 	ip6af->ip6af_nxt = ip6->ip6_nxt;
Index: sys/netinet6/icmp6.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/icmp6.c,v
retrieving revision 1.150
diff -u -p -r1.150 icmp6.c
--- sys/netinet6/icmp6.c	3 Oct 2008 08:23:06 -0000	1.150
+++ sys/netinet6/icmp6.c	19 Dec 2008 18:58:36 -0000
@@ -733,7 +733,7 @@ icmp6_input(struct mbuf **mp, int *offp,
 			nicmp6 = (struct icmp6_hdr *)(nip6 + 1);
 			bcopy(icmp6, nicmp6, sizeof(struct icmp6_hdr));
 			p = (u_char *)(nicmp6 + 1);
-			bzero(p, 4);
+			memset(p, 0, 4);
 			bcopy(hostname, p + 4, maxhlen); /* meaningless TTL */
 			noff = sizeof(struct ip6_hdr);
 			M_COPY_PKTHDR(n, m); /* just for rcvif */
@@ -1116,7 +1116,7 @@ icmp6_mtudisc_update(struct ip6ctlparam 
 			return;
 	}
 
-	bzero(&sin6, sizeof(sin6));
+	memset(&sin6, 0, sizeof(sin6));
 	sin6.sin6_family = PF_INET6;
 	sin6.sin6_len = sizeof(struct sockaddr_in6);
 	sin6.sin6_addr = *dst;
@@ -2291,9 +2291,9 @@ icmp6_redirect_input(struct mbuf *m, int
 			 */
 		}
 
-		bzero(&sdst, sizeof(sdst));
-		bzero(&sgw, sizeof(sgw));
-		bzero(&ssrc, sizeof(ssrc));
+		memset(&sdst, 0, sizeof(sdst));
+		memset(&sgw, 0, sizeof(sgw));
+		memset(&ssrc, 0, sizeof(ssrc));
 		sdst.sin6_family = sgw.sin6_family = ssrc.sin6_family = AF_INET6;
 		sdst.sin6_len = sgw.sin6_len = ssrc.sin6_len =
 			sizeof(struct sockaddr_in6);
@@ -2536,7 +2536,7 @@ icmp6_redirect_output(struct mbuf *m0, s
 		}
 
 		nd_opt_rh = (struct nd_opt_rd_hdr *)p;
-		bzero(nd_opt_rh, sizeof(*nd_opt_rh));
+		memset(nd_opt_rh, 0, sizeof(*nd_opt_rh));
 		nd_opt_rh->nd_opt_rh_type = ND_OPT_REDIRECTED_HEADER;
 		nd_opt_rh->nd_opt_rh_len = len >> 3;
 		p += sizeof(*nd_opt_rh);
Index: sys/netinet6/in6.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/in6.c,v
retrieving revision 1.143
diff -u -p -r1.143 in6.c
--- sys/netinet6/in6.c	19 Dec 2008 18:49:39 -0000	1.143
+++ sys/netinet6/in6.c	19 Dec 2008 18:58:36 -0000
@@ -634,7 +634,7 @@ in6_control1(struct socket *so, u_long c
 		 * convert mask to prefix length (prefixmask has already
 		 * been validated in in6_update_ifa().
 		 */
-		bzero(&pr0, sizeof(pr0));
+		memset(&pr0, 0, sizeof(pr0));
 		pr0.ndpr_ifp = ifp;
 		pr0.ndpr_plen = in6_mask2len(&ifra->ifra_prefixmask.sin6_addr,
 		    NULL);
@@ -913,7 +913,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 		    M_NOWAIT);
 		if (ia == NULL)
 			return ENOBUFS;
-		bzero((void *)ia, sizeof(*ia));
+		memset((void *)ia, 0, sizeof(*ia));
 		LIST_INIT(&ia->ia6_memberships);
 		/* Initialize the address and masks, and put time stamp */
 		ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
@@ -1046,7 +1046,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 		struct in6_addr llsol;
 
 		/* join solicited multicast addr for new host id */
-		bzero(&llsol, sizeof(struct in6_addr));
+		memset(&llsol, 0, sizeof(struct in6_addr));
 		llsol.s6_addr16[0] = htons(0xff02);
 		llsol.s6_addr32[1] = 0;
 		llsol.s6_addr32[2] = htonl(1);
@@ -1122,7 +1122,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 		if (!rt) {
 			struct rt_addrinfo info;
 
-			bzero(&info, sizeof(info));
+			memset(&info, 0, sizeof(info));
 			info.rti_info[RTAX_DST] = (struct sockaddr *)&mltaddr;
 			info.rti_info[RTAX_GATEWAY] =
 			    (struct sockaddr *)&ia->ia_addr;
@@ -1207,7 +1207,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 		if (!rt) {
 			struct rt_addrinfo info;
 
-			bzero(&info, sizeof(info));
+			memset(&info, 0, sizeof(info));
 			info.rti_info[RTAX_DST] = (struct sockaddr *)&mltaddr;
 			info.rti_info[RTAX_GATEWAY] =
 			    (struct sockaddr *)&ia->ia_addr;
@@ -1524,7 +1524,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
 			prefixlen = iflr->prefixlen;
 
 		/* copy args to in6_aliasreq, perform ioctl(SIOCAIFADDR_IN6). */
-		bzero(&ifra, sizeof(ifra));
+		memset(&ifra, 0, sizeof(ifra));
 		bcopy(iflr->iflr_name, ifra.ifra_name, sizeof(ifra.ifra_name));
 
 		bcopy(&iflr->addr, &ifra.ifra_addr,
@@ -1564,7 +1564,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
 		struct sockaddr_in6 *sin6;
 		int cmp;
 
-		bzero(&mask, sizeof(mask));
+		memset(&mask, 0, sizeof(mask));
 		if (iflr->flags & IFLR_PREFIX) {
 			/* lookup a prefix rather than address. */
 			in6_prefixlen2mask(&mask, iflr->prefixlen);
@@ -1637,7 +1637,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
 				if (error != 0)
 					return error;
 			} else
-				bzero(&iflr->dstaddr, sizeof(iflr->dstaddr));
+				memset(&iflr->dstaddr, 0, sizeof(iflr->dstaddr));
 
 			iflr->prefixlen =
 			    in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL);
@@ -1649,7 +1649,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
 			struct in6_aliasreq ifra;
 
 			/* fill in6_aliasreq and do ioctl(SIOCDIFADDR_IN6) */
-			bzero(&ifra, sizeof(ifra));
+			memset(&ifra, 0, sizeof(ifra));
 			bcopy(iflr->iflr_name, ifra.ifra_name,
 			    sizeof(ifra.ifra_name));
 
@@ -1963,7 +1963,7 @@ in6_prefixlen2mask(struct in6_addr *mask
 		return;
 	}
 
-	bzero(maskp, sizeof(*maskp));
+	memset(maskp, 0, sizeof(*maskp));
 	bytelen = len / NBBY;
 	bitlen = len % NBBY;
 	for (i = 0; i < bytelen; i++)
@@ -2218,7 +2218,7 @@ in6_domifdetach(struct ifnet *ifp, void 
 void
 in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
 {
-	bzero(sin, sizeof(*sin));
+	memset(sin, 0, sizeof(*sin));
 	sin->sin_len = sizeof(struct sockaddr_in);
 	sin->sin_family = AF_INET;
 	sin->sin_port = sin6->sin6_port;
@@ -2229,7 +2229,7 @@ in6_sin6_2_sin(struct sockaddr_in *sin, 
 void
 in6_sin_2_v4mapsin6(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
 {
-	bzero(sin6, sizeof(*sin6));
+	memset(sin6, 0, sizeof(*sin6));
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_port = sin->sin_port;
Index: sys/netinet6/in6_pcb.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/in6_pcb.c,v
retrieving revision 1.99
diff -u -p -r1.99 in6_pcb.c
--- sys/netinet6/in6_pcb.c	20 Aug 2008 18:35:20 -0000	1.99
+++ sys/netinet6/in6_pcb.c	19 Dec 2008 18:58:36 -0000
@@ -155,7 +155,7 @@ in6_pcballoc(struct socket *so, void *v)
 	splx(s);
 	if (in6p == NULL)
 		return (ENOBUFS);
-	bzero((void *)in6p, sizeof(*in6p));
+	memset((void *)in6p, 0, sizeof(*in6p));
 	in6p->in6p_af = AF_INET6;
 	in6p->in6p_table = table;
 	in6p->in6p_socket = so;
@@ -240,7 +240,7 @@ in6_pcbbind(void *v, struct mbuf *nam, s
 			if (sin6->sin6_addr.s6_addr32[3]) {
 				struct sockaddr_in sin;
 
-				bzero(&sin, sizeof(sin));
+				memset(&sin, 0, sizeof(sin));
 				sin.sin_len = sizeof(sin);
 				sin.sin_family = AF_INET;
 				bcopy(&sin6->sin6_addr.s6_addr32[3],
@@ -397,7 +397,7 @@ in6_pcbconnect(void *v, struct mbuf *nam
 #ifdef INET
 		struct sockaddr_in sin, *sinp;
 
-		bzero(&sin, sizeof(sin));
+		memset(&sin, 0, sizeof(sin));
 		sin.sin_len = sizeof(sin);
 		sin.sin_family = AF_INET;
 		bcopy(&sin6->sin6_addr.s6_addr32[3], &sin.sin_addr,
@@ -409,7 +409,7 @@ in6_pcbconnect(void *v, struct mbuf *nam
 				error = EADDRNOTAVAIL;
 			return (error);
 		}
-		bzero(&mapped, sizeof(mapped));
+		memset(&mapped, 0, sizeof(mapped));
 		mapped.s6_addr16[5] = htons(0xffff);
 		bcopy(&sinp->sin_addr, &mapped.s6_addr32[3], sizeof(sinp->sin_addr));
 		in6a = &mapped;
@@ -475,7 +475,7 @@ in6_pcbconnect(void *v, struct mbuf *nam
 void
 in6_pcbdisconnect(struct in6pcb *in6p)
 {
-	bzero((void *)&in6p->in6p_faddr, sizeof(in6p->in6p_faddr));
+	memset((void *)&in6p->in6p_faddr, 0, sizeof(in6p->in6p_faddr));
 	in6p->in6p_fport = 0;
 	in6_pcbstate(in6p, IN6P_BOUND);
 	in6p->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
@@ -598,7 +598,7 @@ in6_pcbnotify(struct inpcbtable *table, 
 	if (PRC_IS_REDIRECT(cmd) || cmd == PRC_HOSTDEAD) {
 		fport = 0;
 		lport = 0;
-		bzero((void *)&sa6_src.sin6_addr, sizeof(sa6_src.sin6_addr));
+		memset((void *)&sa6_src.sin6_addr, 0, sizeof(sa6_src.sin6_addr));
 
 		if (cmd != PRC_HOSTDEAD)
 			notify = in6_rtchange;
Index: sys/netinet6/in6_src.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/in6_src.c,v
retrieving revision 1.44
diff -u -p -r1.44 in6_src.c
--- sys/netinet6/in6_src.c	17 Dec 2008 20:51:37 -0000	1.44
+++ sys/netinet6/in6_src.c	19 Dec 2008 18:58:37 -0000
@@ -237,7 +237,7 @@ in6_selectsrc(struct sockaddr_in6 *dstso
 		 * the interface must be specified; otherwise, ifa_ifwithaddr()
 		 * will fail matching the address.
 		 */
-		bzero(&srcsock, sizeof(srcsock));
+		memset(&srcsock, 0, sizeof(srcsock));
 		srcsock.sin6_family = AF_INET6;
 		srcsock.sin6_len = sizeof(srcsock);
 		srcsock.sin6_addr = pi->ipi6_addr;
@@ -888,7 +888,7 @@ addrsel_policy_init(void)
 	init_policy_queue();
 
 	/* initialize the "last resort" policy */
-	bzero(&defaultaddrpolicy, sizeof(defaultaddrpolicy));
+	memset(&defaultaddrpolicy, 0, sizeof(defaultaddrpolicy));
 	defaultaddrpolicy.label = ADDR_LABEL_NOTAPP;
 }
 
Index: sys/netinet6/ip6_forward.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ip6_forward.c,v
retrieving revision 1.65
diff -u -p -r1.65 ip6_forward.c
--- sys/netinet6/ip6_forward.c	23 Apr 2008 06:09:05 -0000	1.65
+++ sys/netinet6/ip6_forward.c	19 Dec 2008 18:58:37 -0000
@@ -287,7 +287,7 @@ ip6_forward(struct mbuf *m, int srcrt)
 	 *
 	 * IPv6 [ESP|AH] IPv6 [extension headers] payload
 	 */
-	bzero(&state, sizeof(state));
+	memset(&state, 0, sizeof(state));
 	state.m = m;
 	state.ro = NULL;	/* update at ipsec6_output_tunnel() */
 	state.dst = NULL;	/* update at ipsec6_output_tunnel() */
Index: sys/netinet6/ip6_input.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ip6_input.c,v
retrieving revision 1.122
diff -u -p -r1.122 ip6_input.c
--- sys/netinet6/ip6_input.c	21 Aug 2008 15:34:10 -0000	1.122
+++ sys/netinet6/ip6_input.c	19 Dec 2008 18:58:37 -0000
@@ -1562,7 +1562,7 @@ ip6_addaux(struct mbuf *m)
 		    M_NOWAIT);
 		if (mtag) {
 			m_tag_prepend(m, mtag);
-			bzero(mtag + 1, sizeof(struct ip6aux));
+			memset(mtag + 1, 0, sizeof(struct ip6aux));
 		}
 	}
 	return mtag;
Index: sys/netinet6/ip6_mroute.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ip6_mroute.c,v
retrieving revision 1.96
diff -u -p -r1.96 ip6_mroute.c
--- sys/netinet6/ip6_mroute.c	6 Aug 2008 15:01:23 -0000	1.96
+++ sys/netinet6/ip6_mroute.c	19 Dec 2008 18:58:37 -0000
@@ -484,8 +484,8 @@ ip6_mrouter_init(struct socket *so, int 
 	ip6_mrouter = so;
 	ip6_mrouter_ver = cmd;
 
-	bzero((void *)mf6ctable, sizeof(mf6ctable));
-	bzero((void *)n6expire, sizeof(n6expire));
+	memset((void *)mf6ctable, 0, sizeof(mf6ctable));
+	memset((void *)n6expire, 0, sizeof(n6expire));
 
 	pim6 = 0;/* used for stubbing out/in pim stuff */
 
@@ -544,10 +544,10 @@ ip6_mrouter_done(void)
 		}
 	}
 #ifdef notyet
-	bzero((void *)qtable, sizeof(qtable));
-	bzero((void *)tbftable, sizeof(tbftable));
+	memset((void *)qtable, 0, sizeof(qtable));
+	memset((void *)tbftable, 0, sizeof(tbftable));
 #endif
-	bzero((void *)mif6table, sizeof(mif6table));
+	memset((void *)mif6table, 0, sizeof(mif6table));
 	nummifs = 0;
 
 	pim6 = 0; /* used to stub out/in pim specific code */
@@ -575,7 +575,7 @@ ip6_mrouter_done(void)
 		}
 	}
 
-	bzero((void *)mf6ctable, sizeof(mf6ctable));
+	memset((void *)mf6ctable, 0, sizeof(mf6ctable));
 
 	/*
 	 * Reset register interface
@@ -757,10 +757,10 @@ del_m6if(mifi_t *mifip)
 	}
 
 #ifdef notyet
-	bzero((void *)qtable[*mifip], sizeof(qtable[*mifip]));
-	bzero((void *)mifp->m6_tbf, sizeof(*(mifp->m6_tbf)));
+	memset((void *)qtable[*mifip], 0, sizeof(qtable[*mifip]));
+	memset((void *)mifp->m6_tbf, 0, sizeof(*(mifp->m6_tbf)));
 #endif
-	bzero((void *)mifp, sizeof (*mifp));
+	memset((void *)mifp, 0, sizeof (*mifp));
 
 	/* Adjust nummifs down */
 	for (mifi = nummifs; mifi > 0; mifi--)
@@ -1242,7 +1242,7 @@ ip6_mforward(struct ip6_hdr *ip6, struct
 			mrt6stat.mrt6s_upcalls++;
 
 			/* insert new entry at head of hash chain */
-			bzero(rt, sizeof(*rt));
+			memset(rt, 0, sizeof(*rt));
 			sockaddr_in6_init(&rt->mf6c_origin, &ip6->ip6_src,
 			    0, 0, 0);
 			sockaddr_in6_init(&rt->mf6c_mcastgrp, &ip6->ip6_dst,
@@ -1443,7 +1443,7 @@ ip6_mdq(struct mbuf *m, struct ifnet *if
 				     mifp++, iif++)
 					;
 
-				bzero(&sin6, sizeof(sin6));
+				memset(&sin6, 0, sizeof(sin6));
 				sin6.sin6_len = sizeof(sin6);
 				sin6.sin6_family = AF_INET6;
 				switch (ip6_mrouter_ver) {
Index: sys/netinet6/ip6_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ip6_output.c,v
retrieving revision 1.135
diff -u -p -r1.135 ip6_output.c
--- sys/netinet6/ip6_output.c	27 Oct 2008 20:03:07 -0000	1.135
+++ sys/netinet6/ip6_output.c	19 Dec 2008 18:58:38 -0000
@@ -237,7 +237,7 @@ ip6_output(
 	}								\
     } while (/*CONSTCOND*/ 0)
 
-	bzero(&exthdrs, sizeof(exthdrs));
+	memset(&exthdrs, 0, sizeof(exthdrs));
 	if (opt) {
 		/* Hop-by-Hop options header */
 		MAKE_EXTHDR(opt->ip6po_hbh, &exthdrs.ip6e_hbh);
@@ -467,7 +467,7 @@ ip6_output(
 			rh->ip6r_segleft = 0;
 		}
 
-		bzero(&state, sizeof(state));
+		memset(&state, 0, sizeof(state));
 		state.m = m;
 		error = ipsec6_output_trans(&state, nexthdrp, mprev, sp, flags,
 		    &needipsectun);
@@ -613,10 +613,10 @@ skip_ipsec2:;
 		 *
 		 * IPv6 [ESP|AH] IPv6 [extension headers] payload
 		 */
-		bzero(&exthdrs, sizeof(exthdrs));
+		memset(&exthdrs, 0, sizeof(exthdrs));
 		exthdrs.ip6e_ip6 = m;
 
-		bzero(&state, sizeof(state));
+		memset(&state, 0, sizeof(state));
 		state.m = m;
 		state.ro = ro;
 		state.dst = rtcache_getdst(ro);
@@ -941,7 +941,7 @@ skip_ipsec2:;
 		struct ip6ctlparam ip6cp;
 
 		mtu32 = (u_int32_t)mtu;
-		bzero(&ip6cp, sizeof(ip6cp));
+		memset(&ip6cp, 0, sizeof(ip6cp));
 		ip6cp.ip6c_cmdarg = (void *)&mtu32;
 		pfctlinput2(PRC_MSGSIZE,
 		    rtcache_getdst(ro_pmtu), &ip6cp);
@@ -1038,7 +1038,7 @@ skip_ipsec2:;
 
 		/* Notify a proper path MTU to applications. */
 		mtu32 = (u_int32_t)mtu;
-		bzero(&ip6cp, sizeof(ip6cp));
+		memset(&ip6cp, 0, sizeof(ip6cp));
 		ip6cp.ip6c_cmdarg = (void *)&mtu32;
 		pfctlinput2(PRC_MSGSIZE,
 		    rtcache_getdst(ro_pmtu), &ip6cp);
Index: sys/netinet6/ipcomp_core.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ipcomp_core.c,v
retrieving revision 1.28
diff -u -p -r1.28 ipcomp_core.c
--- sys/netinet6/ipcomp_core.c	5 May 2008 13:41:30 -0000	1.28
+++ sys/netinet6/ipcomp_core.c	19 Dec 2008 18:58:38 -0000
@@ -165,7 +165,7 @@ do { \
 	if (!mprev)
 		panic("md is not in m in deflate_common");
 
-	bzero(&zs, sizeof(zs));
+	memset(&zs, 0, sizeof(zs));
 	zs.zalloc = deflate_alloc;
 	zs.zfree = deflate_free;
 
Index: sys/netinet6/ipcomp_output.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ipcomp_output.c,v
retrieving revision 1.28
diff -u -p -r1.28 ipcomp_output.c
--- sys/netinet6/ipcomp_output.c	5 May 2008 13:41:30 -0000	1.28
+++ sys/netinet6/ipcomp_output.c	19 Dec 2008 18:58:38 -0000
@@ -278,7 +278,7 @@ ipcomp_output(struct mbuf *m, u_char *ne
 		ipcomp = mtod(md, struct ipcomp *);
 	}
 
-	bzero(ipcomp, sizeof(*ipcomp));
+	memset(ipcomp, 0, sizeof(*ipcomp));
 	ipcomp->comp_nxt = *nexthdrp;
 	*nexthdrp = IPPROTO_IPCOMP;
 	ipcomp->comp_cpi = htons(cpi);
Index: sys/netinet6/ipsec.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/ipsec.c,v
retrieving revision 1.133
diff -u -p -r1.133 ipsec.c
--- sys/netinet6/ipsec.c	11 Oct 2008 13:40:58 -0000	1.133
+++ sys/netinet6/ipsec.c	19 Dec 2008 18:58:38 -0000
@@ -590,7 +590,7 @@ ipsec4_getpolicybyaddr(struct mbuf *m, u
     {
 	struct secpolicyindex spidx;
 
-	bzero(&spidx, sizeof(spidx));
+	memset(&spidx, 0, sizeof(spidx));
 
 	/* make an index to look for a policy */
 	*error = ipsec_setspidx_mbuf(&spidx, AF_INET, m,
@@ -815,7 +815,7 @@ ipsec6_getpolicybyaddr(struct mbuf *m, u
     {
 	struct secpolicyindex spidx;
 
-	bzero(&spidx, sizeof(spidx));
+	memset(&spidx, 0, sizeof(spidx));
 
 	/* make an index to look for a policy */
 	*error = ipsec_setspidx_mbuf(&spidx, AF_INET6, m,
@@ -870,7 +870,7 @@ ipsec_setspidx_mbuf(struct secpolicyinde
 	if (spidx == NULL || m == NULL)
 		panic("ipsec_setspidx_mbuf: NULL pointer was passed.");
 
-	bzero(spidx, sizeof(*spidx));
+	memset(spidx, 0, sizeof(*spidx));
 
 	error = ipsec_setspidx(m, spidx, needport);
 	if (error)
@@ -880,7 +880,7 @@ ipsec_setspidx_mbuf(struct secpolicyinde
 
     bad:
 	/* XXX initialize */
-	bzero(spidx, sizeof(*spidx));
+	memset(spidx, 0, sizeof(*spidx));
 	return EINVAL;
 }
 
@@ -902,7 +902,7 @@ ipsec_setspidx(struct mbuf *m, struct se
 	if (m == NULL)
 		panic("ipsec_setspidx: m == 0 passed.");
 
-	bzero(spidx, sizeof(*spidx));
+	memset(spidx, 0, sizeof(*spidx));
 
 	/*
 	 * validate m->m_pkthdr.len.  we see incorrect length if we
@@ -1061,14 +1061,14 @@ ipsec4_setspidx_ipaddr(struct mbuf *m, s
 	}
 
 	sin = (struct sockaddr_in *)&spidx->src;
-	bzero(sin, sizeof(*sin));
+	memset(sin, 0, sizeof(*sin));
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(struct sockaddr_in);
 	bcopy(&ip->ip_src, &sin->sin_addr, sizeof(ip->ip_src));
 	spidx->prefs = sizeof(struct in_addr) << 3;
 
 	sin = (struct sockaddr_in *)&spidx->dst;
-	bzero(sin, sizeof(*sin));
+	memset(sin, 0, sizeof(*sin));
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(struct sockaddr_in);
 	bcopy(&ip->ip_dst, &sin->sin_addr, sizeof(ip->ip_dst));
@@ -1156,14 +1156,14 @@ ipsec6_setspidx_ipaddr(struct mbuf *m, s
 	}
 
 	sin6 = (struct sockaddr_in6 *)&spidx->src;
-	bzero(sin6, sizeof(*sin6));
+	memset(sin6, 0, sizeof(*sin6));
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	sin6->sin6_addr = ip6->ip6_src;
 	spidx->prefs = sizeof(struct in6_addr) << 3;
 
 	sin6 = (struct sockaddr_in6 *)&spidx->dst;
-	bzero(sin6, sizeof(*sin6));
+	memset(sin6, 0, sizeof(*sin6));
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	sin6->sin6_addr = ip6->ip6_dst;
@@ -1232,7 +1232,7 @@ ipsec_init_pcbpolicy(struct socket *so, 
 		ipseclog((LOG_DEBUG, "ipsec_init_pcbpolicy: No more memory.\n"));
 		return ENOBUFS;
 	}
-	bzero(new, sizeof(*new));
+	memset(new, 0, sizeof(*new));
 
 	if (so->so_uidinfo->ui_uid == 0)	/* XXX */
 		new->priv = 1;
@@ -1328,7 +1328,7 @@ ipsec_deepcopy_policy(struct secpolicy *
 			M_SECA, M_NOWAIT);
 		if (*q == NULL)
 			goto fail;
-		bzero(*q, sizeof(**q));
+		memset(*q, 0, sizeof(**q));
 		(*q)->next = NULL;
 
 		(*q)->saidx.proto = p->saidx.proto;
@@ -2342,7 +2342,7 @@ ipsec_updatereplay(u_int32_t seq, struct
 	/* first time */
 	if (replay->count == 0) {
 		replay->lastseq = seq;
-		bzero(replay->bitmap, replay->wsize);
+		memset(replay->bitmap, 0, replay->wsize);
 		replay->bitmap[frlast] = 1;
 		goto ok;
 	}
@@ -2359,7 +2359,7 @@ ipsec_updatereplay(u_int32_t seq, struct
 			replay->bitmap[frlast] |= 1;
 		} else {
 			/* this packet has a "way larger" */
-			bzero(replay->bitmap, replay->wsize);
+			memset(replay->bitmap, 0, replay->wsize);
 			replay->bitmap[frlast] = 1;
 		}
 		replay->lastseq = seq;
@@ -2564,7 +2564,7 @@ ipsec4_checksa(struct ipsecrequest *isr,
 	saidx.reqid = isr->saidx.reqid;
 	sin = (struct sockaddr_in *)&saidx.src;
 	if (sin->sin_len == 0) {
-		bzero(sin, sizeof(*sin));
+		memset(sin, 0, sizeof(*sin));
 		sin->sin_len = sizeof(*sin);
 		sin->sin_family = AF_INET;
 		sin->sin_port = IPSEC_PORT_ANY;
@@ -2572,7 +2572,7 @@ ipsec4_checksa(struct ipsecrequest *isr,
 	}
 	sin = (struct sockaddr_in *)&saidx.dst;
 	if (sin->sin_len == 0) {
-		bzero(sin, sizeof(*sin));
+		memset(sin, 0, sizeof(*sin));
 		sin->sin_len = sizeof(*sin);
 		sin->sin_family = AF_INET;
 		sin->sin_port = IPSEC_PORT_ANY;
@@ -2808,7 +2808,7 @@ ipsec6_checksa(struct ipsecrequest *isr,
 	/* make SA index for search proper SA */
 	ip6 = mtod(state->m, struct ip6_hdr *);
 	if (tunnel) {
-		bzero(&saidx, sizeof(saidx));
+		memset(&saidx, 0, sizeof(saidx));
 		saidx.proto = isr->saidx.proto;
 	} else
 		bcopy(&isr->saidx, &saidx, sizeof(saidx));
@@ -2816,7 +2816,7 @@ ipsec6_checksa(struct ipsecrequest *isr,
 	saidx.reqid = isr->saidx.reqid;
 	sin6 = (struct sockaddr_in6 *)&saidx.src;
 	if (sin6->sin6_len == 0 || tunnel) {
-		bzero(sin6, sizeof(*sin6));
+		memset(sin6, 0, sizeof(*sin6));
 		sin6->sin6_len = sizeof(*sin6);
 		sin6->sin6_family = AF_INET6;
 		sin6->sin6_port = IPSEC_PORT_ANY;
@@ -2824,7 +2824,7 @@ ipsec6_checksa(struct ipsecrequest *isr,
 	}
 	sin6 = (struct sockaddr_in6 *)&saidx.dst;
 	if (sin6->sin6_len == 0 || tunnel) {
-		bzero(sin6, sizeof(*sin6));
+		memset(sin6, 0, sizeof(*sin6));
 		sin6->sin6_len = sizeof(*sin6);
 		sin6->sin6_family = AF_INET6;
 		sin6->sin6_port = IPSEC_PORT_ANY;
@@ -3437,7 +3437,7 @@ ipsec_addaux(struct mbuf *m)
 	if (mtag == NULL)
 		return NULL;	/* ENOBUFS */
 	/* XXX is this necessary? */
-	bzero((void *)(mtag + 1), sizeof(struct ipsecaux));
+	memset((void *)(mtag + 1), 0, sizeof(struct ipsecaux));
 	return mtag;
 }
 
Index: sys/netinet6/nd6_nbr.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/nd6_nbr.c,v
retrieving revision 1.90
diff -u -p -r1.90 nd6_nbr.c
--- sys/netinet6/nd6_nbr.c	31 Jul 2008 18:24:07 -0000	1.90
+++ sys/netinet6/nd6_nbr.c	19 Dec 2008 18:58:39 -0000
@@ -480,7 +480,7 @@ nd6_ns_output(struct ifnet *ifp, const s
 		 * above), but we do so here explicitly to make the intention
 		 * clearer.
 		 */
-		bzero(&src_in, sizeof(src_in));
+		memset(&src_in, 0, sizeof(src_in));
 		src = &src_in;
 	}
 	ip6->ip6_src = *src;
@@ -512,7 +512,7 @@ nd6_ns_output(struct ifnet *ifp, const s
 		m->m_pkthdr.len += optlen;
 		m->m_len += optlen;
 		icmp6len += optlen;
-		bzero((void *)nd_opt, optlen);
+		memset((void *)nd_opt, 0, optlen);
 		nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR;
 		nd_opt->nd_opt_len = optlen >> 3;
 		bcopy(mac, (void *)(nd_opt + 1), ifp->if_addrlen);
@@ -971,7 +971,7 @@ nd6_na_output(
 		m->m_pkthdr.len += optlen;
 		m->m_len += optlen;
 		icmp6len += optlen;
-		bzero((void *)nd_opt, optlen);
+		memset((void *)nd_opt, 0, optlen);
 		nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
 		nd_opt->nd_opt_len = optlen >> 3;
 		bcopy(mac, (void *)(nd_opt + 1), ifp->if_addrlen);
@@ -1114,7 +1114,7 @@ nd6_dad_start(struct ifaddr *ifa, int xt
 			ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???");
 		return;
 	}
-	bzero(dp, sizeof(*dp));
+	memset(dp, 0, sizeof(*dp));
 	callout_init(&dp->dad_timer_ch, CALLOUT_MPSAFE);
 	TAILQ_INSERT_TAIL(&dadq, (struct dadq *)dp, dad_list);
 
Index: sys/netinet6/nd6_rtr.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/nd6_rtr.c,v
retrieving revision 1.77
diff -u -p -r1.77 nd6_rtr.c
--- sys/netinet6/nd6_rtr.c	19 Dec 2008 18:49:39 -0000	1.77
+++ sys/netinet6/nd6_rtr.c	19 Dec 2008 18:58:39 -0000
@@ -316,7 +316,7 @@ nd6_ra_input(struct mbuf *m, int off, in
 				continue;
 			}
 
-			bzero(&pr, sizeof(pr));
+			memset(&pr, 0, sizeof(pr));
 			sockaddr_in6_init(&pr.ndpr_prefix,
 			    &pi->nd_opt_pi_prefix, 0, 0, 0);
 			pr.ndpr_ifp = (struct ifnet *)m->m_pkthdr.rcvif;
@@ -418,7 +418,7 @@ nd6_rtmsg(int cmd, struct rtentry *rt)
 {
 	struct rt_addrinfo info;
 
-	bzero((void *)&info, sizeof(info));
+	memset((void *)&info, 0, sizeof(info));
 	info.rti_info[RTAX_DST] = rt_getkey(rt);
 	info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 	info.rti_info[RTAX_NETMASK] = rt_mask(rt);
@@ -777,7 +777,7 @@ defrtrlist_update(struct nd_defrouter *n
 		splx(s);
 		return (NULL);
 	}
-	bzero(n, sizeof(*n));
+	memset(n, 0, sizeof(*n));
 	*n = *new;
 
 insert:
@@ -1580,7 +1580,7 @@ nd6_prefix_onlink(struct nd_prefix *pr)
 	 * in6_ifinit() sets nd6_rtrequest to ifa_rtrequest for all ifaddrs.
 	 * ifa->ifa_rtrequest = nd6_rtrequest;
 	 */
-	bzero(&mask6, sizeof(mask6));
+	memset(&mask6, 0, sizeof(mask6));
 	mask6.sin6_len = sizeof(mask6);
 	mask6.sin6_addr = pr->ndpr_mask;
 	/* rtrequest() will probably set RTF_UP, but we're not sure. */
Index: sys/netinet6/udp6_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/udp6_usrreq.c,v
retrieving revision 1.86
diff -u -p -r1.86 udp6_usrreq.c
--- sys/netinet6/udp6_usrreq.c	4 May 2008 07:22:15 -0000	1.86
+++ sys/netinet6/udp6_usrreq.c	19 Dec 2008 18:58:39 -0000
@@ -195,7 +195,7 @@ udp6_ctlinput(int cmd, const struct sock
 			return NULL;
 		}
 
-		bzero(&uh, sizeof(uh));
+		memset(&uh, 0, sizeof(uh));
 		m_copydata(m, off, sizeof(*uhp), (void *)&uh);
 
 		if (cmd == PRC_MSGSIZE) {
@@ -345,7 +345,7 @@ udp6_usrreq(struct socket *so, int req, 
 		}
 		s = splsoftnet();
 		in6_pcbdisconnect(in6p);
-		bzero((void *)&in6p->in6p_laddr, sizeof(in6p->in6p_laddr));
+		memset((void *)&in6p->in6p_laddr, 0, sizeof(in6p->in6p_laddr));
 		splx(s);
 		so->so_state &= ~SS_ISCONNECTED;		/* XXX */
 		in6_pcbstate(in6p, IN6P_BOUND);		/* XXX */
Index: sys/netipsec/ipsec.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/ipsec.c,v
retrieving revision 1.39
diff -u -p -r1.39 ipsec.c
--- sys/netipsec/ipsec.c	27 Jun 2008 17:28:24 -0000	1.39
+++ sys/netipsec/ipsec.c	19 Dec 2008 18:58:39 -0000
@@ -666,7 +666,7 @@ ipsec_getpolicybyaddr(struct mbuf *m, u_
 	if (*error != 0) {
 		DPRINTF(("ipsec_getpolicybyaddr: setpidx failed,"
 			" dir %u flag %u\n", dir, flag));
-		bzero(&spidx, sizeof (spidx));
+		memset(&spidx, 0, sizeof (spidx));
 		return NULL;
 	}
 
@@ -818,8 +818,8 @@ ipsec6_setspidx_in6pcb(struct mbuf *m, s
 	IPSEC_ASSERT(pcb->in6p_sp->sp_out != NULL && pcb->in6p_sp->sp_in != NULL,
 		("ipsec6_setspidx_in6pcb: null sp_in || sp_out"));
 
-	bzero(&pcb->in6p_sp->sp_in->spidx, sizeof(*spidx));
-	bzero(&pcb->in6p_sp->sp_out->spidx, sizeof(*spidx));
+	memset(&pcb->in6p_sp->sp_in->spidx, 0, sizeof(*spidx));
+	memset(&pcb->in6p_sp->sp_out->spidx, 0, sizeof(*spidx));
 
 	spidx = &pcb->in6p_sp->sp_in->spidx;
 	error = ipsec_setspidx(m, spidx, 1);
@@ -836,8 +836,8 @@ ipsec6_setspidx_in6pcb(struct mbuf *m, s
 	return 0;
 
 bad:
-	bzero(&pcb->in6p_sp->sp_in->spidx, sizeof(*spidx));
-	bzero(&pcb->in6p_sp->sp_out->spidx, sizeof(*spidx));
+	memset(&pcb->in6p_sp->sp_in->spidx, 0, sizeof(*spidx));
+	memset(&pcb->in6p_sp->sp_out->spidx, 0, sizeof(*spidx));
 	return error;
 }
 #endif
@@ -1120,7 +1120,7 @@ ipsec6_setspidx_ipaddr(struct mbuf *m, s
 	}
 
 	sin6 = (struct sockaddr_in6 *)&spidx->src;
-	bzero(sin6, sizeof(*sin6));
+	memset(sin6, 0, sizeof(*sin6));
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	bcopy(&ip6->ip6_src, &sin6->sin6_addr, sizeof(ip6->ip6_src));
@@ -1131,7 +1131,7 @@ ipsec6_setspidx_ipaddr(struct mbuf *m, s
 	spidx->prefs = sizeof(struct in6_addr) << 3;
 
 	sin6 = (struct sockaddr_in6 *)&spidx->dst;
-	bzero(sin6, sizeof(*sin6));
+	memset(sin6, 0, sizeof(*sin6));
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	bcopy(&ip6->ip6_dst, &sin6->sin6_addr, sizeof(ip6->ip6_dst));
@@ -1244,7 +1244,7 @@ ipsec_deepcopy_policy(struct secpolicy *
 			M_SECA, M_NOWAIT);
 		if (*q == NULL)
 			goto fail;
-		bzero(*q, sizeof(**q));
+		memset(*q, 0, sizeof(**q));
 		(*q)->next = NULL;
 
 		(*q)->saidx.proto = p->saidx.proto;
@@ -2010,7 +2010,7 @@ ipsec_updatereplay(u_int32_t seq, struct
 	/* first time */
 	if (replay->count == 0) {
 		replay->lastseq = seq;
-		bzero(replay->bitmap, replay->wsize);
+		memset(replay->bitmap, 0, replay->wsize);
 		(replay->bitmap)[frlast] = 1;
 		goto ok;
 	}
@@ -2027,7 +2027,7 @@ ipsec_updatereplay(u_int32_t seq, struct
 			(replay->bitmap)[frlast] |= 1;
 		} else {
 			/* this packet has a "way larger" */
-			bzero(replay->bitmap, replay->wsize);
+			memset(replay->bitmap, 0, replay->wsize);
 			(replay->bitmap)[frlast] = 1;
 		}
 		replay->lastseq = seq;
Index: sys/netipsec/ipsec_input.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/ipsec_input.c,v
retrieving revision 1.20
diff -u -p -r1.20 ipsec_input.c
--- sys/netipsec/ipsec_input.c	23 Apr 2008 06:09:05 -0000	1.20
+++ sys/netipsec/ipsec_input.c	19 Dec 2008 18:58:39 -0000
@@ -187,7 +187,7 @@ ipsec_common_input(struct mbuf *m, int s
 	 * kernel crypto routine. The resulting mbuf chain is a valid
 	 * IP packet ready to go through input processing.
 	 */
-	bzero(&dst_address, sizeof (dst_address));
+	memset(&dst_address, 0, sizeof (dst_address));
 	dst_address.sa.sa_family = af;
 	switch (af) {
 #ifdef INET
@@ -548,7 +548,7 @@ esp6_ctlinput(int cmd, struct sockaddr *
 		 * no possibility of an infinite loop of function calls,
 		 * because we don't pass the inner IPv6 header.
 		 */
-		bzero(&ip6cp1, sizeof(ip6cp1));
+		memset(&ip6cp1, 0, sizeof(ip6cp1));
 		ip6cp1.ip6c_src = ip6cp->ip6c_src;
 		pfctlinput2(cmd, sa, &ip6cp1);
 
Index: sys/netipsec/keysock.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/keysock.c,v
retrieving revision 1.16
diff -u -p -r1.16 keysock.c
--- sys/netipsec/keysock.c	24 Apr 2008 11:38:38 -0000	1.16
+++ sys/netipsec/keysock.c	19 Dec 2008 18:58:39 -0000
@@ -186,7 +186,7 @@ key_sendup0(
 		m->m_pkthdr.len += sizeof(*pmsg);
 
 		pmsg = mtod(m, struct sadb_msg *);
-		bzero(pmsg, sizeof(*pmsg));
+		memset(pmsg, 0, sizeof(*pmsg));
 		pmsg->sadb_msg_version = PF_KEY_V2;
 		pmsg->sadb_msg_type = SADB_X_PROMISC;
 		pmsg->sadb_msg_len = PFKEY_UNIT64(m->m_pkthdr.len);
@@ -644,7 +644,7 @@ key_usrreq(struct socket *so, int req,st
 		sosetlock(so);
 		so->so_pcb = kp;
 		if (so->so_pcb)
-			bzero(so->so_pcb, sizeof(*kp));
+			memset(so->so_pcb, 0, sizeof(*kp));
 	}
 	if (req == PRU_DETACH && kp) {
 		int af = kp->kp_raw.rcb_proto.sp_protocol;
@@ -717,7 +717,7 @@ struct protosw keysw[] = {
 static void
 key_init0(void)
 {
-	bzero(&key_cb, sizeof(key_cb));
+	memset(&key_cb, 0, sizeof(key_cb));
 	key_init();
 }
 
Index: sys/netipsec/xform_ah.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/xform_ah.c,v
retrieving revision 1.22
diff -u -p -r1.22 xform_ah.c
--- sys/netipsec/xform_ah.c	17 Dec 2008 20:51:38 -0000	1.22
+++ sys/netipsec/xform_ah.c	19 Dec 2008 18:58:39 -0000
@@ -214,7 +214,7 @@ ah_init0(struct secasvar *sav, struct xf
 	sav->tdb_authalgxform = thash;
 
 	/* Initialize crypto session. */
-	bzero(cria, sizeof (*cria));
+	memset(cria, 0, sizeof (*cria));
 	cria->cri_alg = sav->tdb_authalgxform->type;
 	cria->cri_klen = _KEYBITS(sav->key_auth);
 	cria->cri_key = _KEYBUF(sav->key_auth);
@@ -252,7 +252,7 @@ ah_zeroize(struct secasvar *sav)
 	int err;
 
 	if (sav->key_auth)
-		bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
+		memset(_KEYBUF(sav->key_auth), 0, _KEYLEN(sav->key_auth));
 
 	mutex_spin_enter(&crypto_mtx);
 	err = crypto_freesession(sav->tdb_cryptoid);
@@ -877,7 +877,7 @@ ah_input_cb(struct cryptop *crp)
 	authsize = AUTHSIZE(sav);
 
 	if (ipsec_debug)
-	  bzero(calc, sizeof(calc));
+	  memset(calc, 0, sizeof(calc));
 
 	/* Copy authenticator off the packet. */
 	m_copydata(m, skip + rplen, authsize, calc);
Index: sys/netipsec/xform_esp.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/xform_esp.c,v
retrieving revision 1.18
diff -u -p -r1.18 xform_esp.c
--- sys/netipsec/xform_esp.c	23 Apr 2008 06:09:05 -0000	1.18
+++ sys/netipsec/xform_esp.c	19 Dec 2008 18:58:40 -0000
@@ -227,7 +227,7 @@ esp_init(struct secasvar *sav, struct xf
 	sav->tdb_encalgxform = txform;
 
 	/* Initialize crypto session. */
-	bzero(&crie, sizeof (crie));
+	memset(&crie, 0, sizeof (crie));
 	crie.cri_alg = sav->tdb_encalgxform->type;
 	crie.cri_klen = _KEYBITS(sav->key_enc);
 	crie.cri_key = _KEYBUF(sav->key_enc);
@@ -264,7 +264,7 @@ esp_zeroize(struct secasvar *sav)
 	int error = ah_zeroize(sav);
 
 	if (sav->key_enc)
-		bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
+		memset(_KEYBUF(sav->key_enc), 0, _KEYLEN(sav->key_enc));
 	/* NB: sav->iv is freed elsewhere, even though we malloc it! */
 	sav->tdb_encalgxform = NULL;
 	sav->tdb_xform = NULL;
@@ -831,7 +831,7 @@ esp_output(
 		(void) read_random(pad, padding - 2);
 		break;
 	case SADB_X_EXT_PZERO:
-		bzero(pad, padding - 2);
+		memset(pad, 0, padding - 2);
 		break;
 	case SADB_X_EXT_PSEQ:
 		for (i = 0; i < padding - 2; i++)
Index: sys/netipsec/xform_ipcomp.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/xform_ipcomp.c,v
retrieving revision 1.18
diff -u -p -r1.18 xform_ipcomp.c
--- sys/netipsec/xform_ipcomp.c	23 Apr 2008 06:09:05 -0000	1.18
+++ sys/netipsec/xform_ipcomp.c	19 Dec 2008 18:58:40 -0000
@@ -122,7 +122,7 @@ ipcomp_init(struct secasvar *sav, struct
 	sav->tdb_compalgxform = tcomp;
 
 	/* Initialize crypto session */
-	bzero(&cric, sizeof (cric));
+	memset(&cric, 0, sizeof (cric));
 	cric.cri_alg = sav->tdb_compalgxform->type;
 
 	mutex_spin_enter(&crypto_mtx);
Index: sys/netipsec/xform_tcp.c
===================================================================
RCS file: /cvsroot/src/sys/netipsec/xform_tcp.c,v
retrieving revision 1.4
diff -u -p -r1.4 xform_tcp.c
--- sys/netipsec/xform_tcp.c	11 Dec 2007 12:40:10 -0000	1.4
+++ sys/netipsec/xform_tcp.c	19 Dec 2008 18:58:40 -0000
@@ -122,7 +122,7 @@ tcpsignature_zeroize(struct secasvar *sa
 {
 
 	if (sav->key_auth)
-		bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
+		memset(_KEYBUF(sav->key_auth), 0, _KEYLEN(sav->key_auth));
 
 	sav->tdb_cryptoid = 0;
 	sav->tdb_authalgxform = NULL;
Index: sys/netiso/clnp_output.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/clnp_output.c,v
retrieving revision 1.22
diff -u -p -r1.22 clnp_output.c
--- sys/netiso/clnp_output.c	14 Jan 2008 04:17:35 -0000	1.22
+++ sys/netiso/clnp_output.c	19 Dec 2008 18:58:40 -0000
@@ -352,7 +352,7 @@ clnp_output(struct mbuf *m0, ...)
 			printf("clnp_output: NEW clcp %p\n", clcp);
 		}
 #endif
-		bzero((void *) clcp, sizeof(struct clnp_cache));
+		memset((void *) clcp, 0, sizeof(struct clnp_cache));
 
 		if (isop->isop_optindex)
 			oidx = mtod(isop->isop_optindex, struct clnp_optidx *);
Index: sys/netiso/clnp_subr.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/clnp_subr.c,v
retrieving revision 1.31
diff -u -p -r1.31 clnp_subr.c
--- sys/netiso/clnp_subr.c	14 Jan 2008 04:17:35 -0000	1.31
+++ sys/netiso/clnp_subr.c	19 Dec 2008 18:58:40 -0000
@@ -267,7 +267,7 @@ clnp_forward(
 	extern int      iso_systype;
 
 	clnp = mtod(m, struct clnp_fixed *);
-	bzero((void *) & route, sizeof(route));	/* MUST be done before
+	memset((void *) & route, 0, sizeof(route));	/* MUST be done before
 							 * "bad:" */
 
 	/*
@@ -609,7 +609,7 @@ clnp_echoreply(
 	int             ret;
 
 	/* fill in fake isopcb to pass to output function */
-	bzero(&isopcb, sizeof(isopcb));
+	memset(&isopcb, 0, sizeof(isopcb));
 	isopcb.isop_laddr = ec_dst;
 	isopcb.isop_faddr = ec_src;
 
Index: sys/netiso/esis.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/esis.c,v
retrieving revision 1.53
diff -u -p -r1.53 esis.c
--- sys/netiso/esis.c	17 Dec 2008 20:51:38 -0000	1.53
+++ sys/netiso/esis.c	19 Dec 2008 18:58:40 -0000
@@ -396,7 +396,7 @@ esis_rdoutput(
 		esis_stat.es_nomem++;
 		return;
 	}
-	bzero(mtod(m, void *), MHLEN);
+	memset(mtod(m, void *), 0, MHLEN);
 
 	pdu = mtod(m, struct esis_fixed *);
 	cp = (void *) (pdu + 1);	/* pointer arith.; 1st byte after
@@ -495,7 +495,7 @@ esis_rdoutput(
 	pdu->esis_hdr_len = m0->m_pkthdr.len = len;
 	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int) pdu->esis_hdr_len);
 
-	bzero((void *) & siso, sizeof(siso));
+	memset((void *) & siso, 0, sizeof(siso));
 	siso.siso_family = AF_ISO;
 	siso.siso_data[0] = AFI_SNA;
 	siso.siso_nlen = 6 + 1;	/* should be taken from snpa_hdr */
@@ -922,7 +922,7 @@ esis_shoutput(
 		esis_stat.es_nomem++;
 		return;
 	}
-	bzero(mtod(m, void *), MHLEN);
+	memset(mtod(m, void *), 0, MHLEN);
 
 	pdu = mtod(m, struct esis_fixed *);
 	naddrp = cp = (char *) (pdu + 1);
@@ -1014,7 +1014,7 @@ esis_shoutput(
 	pdu->esis_hdr_len = len;
 	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int) pdu->esis_hdr_len);
 
-	bzero((void *) & siso, sizeof(siso));
+	memset((void *) & siso, 0, sizeof(siso));
 	siso.siso_family = AF_ISO;
 	siso.siso_data[0] = AFI_SNA;
 	siso.siso_nlen = sn_len + 1;
@@ -1146,7 +1146,7 @@ isis_output(struct mbuf *m, ...)
 		printf("\n");
 	}
 #endif
-	bzero((void *) & siso, sizeof(siso));
+	memset((void *) & siso, 0, sizeof(siso));
 	siso.siso_family = AF_ISO;	/* This convention may be useful for
 					 * X.25 */
 	if (sn_len == 0)
Index: sys/netiso/idrp_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/idrp_usrreq.c,v
retrieving revision 1.20
diff -u -p -r1.20 idrp_usrreq.c
--- sys/netiso/idrp_usrreq.c	17 Dec 2008 20:51:38 -0000	1.20
+++ sys/netiso/idrp_usrreq.c	19 Dec 2008 18:58:40 -0000
@@ -113,10 +113,10 @@ idrp_input(struct mbuf *m, ...)
 bad:		m_freem(m);
 		return;
 	}
-	bzero(idrp_addrs[0].siso_data, sizeof(idrp_addrs[0].siso_data));
+	memset(idrp_addrs[0].siso_data, 0, sizeof(idrp_addrs[0].siso_data));
 	bcopy((void *) & (src->siso_addr), (void *) & idrp_addrs[0].siso_addr,
 	      1 + src->siso_nlen);
-	bzero(idrp_addrs[1].siso_data, sizeof(idrp_addrs[1].siso_data));
+	memset(idrp_addrs[1].siso_data, 0, sizeof(idrp_addrs[1].siso_data));
 	bcopy((void *) & (dst->siso_addr), (void *) & idrp_addrs[1].siso_addr,
 	      1 + dst->siso_nlen);
 	if (sbappendaddr(&idrp_isop.isop_socket->so_rcv,
Index: sys/netiso/iso.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/iso.c,v
retrieving revision 1.52
diff -u -p -r1.52 iso.c
--- sys/netiso/iso.c	17 Dec 2008 20:51:38 -0000	1.52
+++ sys/netiso/iso.c	19 Dec 2008 18:58:40 -0000
@@ -316,7 +316,7 @@ iso_hash(
 	int    bufsize;
 
 
-	bzero(buf, sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 
 	bufsize = iso_netof(&siso->siso_addr, buf);
 	hp->afh_nethash = iso_hashchar((void *) buf, bufsize);
Index: sys/netiso/tp_emit.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/tp_emit.c,v
retrieving revision 1.27
diff -u -p -r1.27 tp_emit.c
--- sys/netiso/tp_emit.c	23 Apr 2008 09:57:59 -0000	1.27
+++ sys/netiso/tp_emit.c	19 Dec 2008 18:58:41 -0000
@@ -191,7 +191,7 @@ tp_emit(
 			m->m_nextpkt = NULL;
 			m->m_data = m->m_pktdat;
 			m->m_flags = M_PKTHDR;
-			bzero(&m->m_pkthdr, sizeof(m->m_pkthdr));
+			memset(&m->m_pkthdr, 0, sizeof(m->m_pkthdr));
 		}
 	} else {
 		MGETHDR(m, M_DONTWAIT, TPMT_TPHDR);
@@ -207,7 +207,7 @@ tp_emit(
 	m->m_nextpkt = NULL;
 
 	hdr = mtod(m, struct tpdu *);
-	bzero((void *) hdr, sizeof(struct tpdu));
+	memset((void *) hdr, 0, sizeof(struct tpdu));
 
 	{
 		hdr->tpdu_type = dutype;
Index: sys/netiso/tp_inet.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/tp_inet.c,v
retrieving revision 1.36
diff -u -p -r1.36 tp_inet.c
--- sys/netiso/tp_inet.c	20 Dec 2007 19:53:35 -0000	1.36
+++ sys/netiso/tp_inet.c	19 Dec 2008 18:58:41 -0000
@@ -283,7 +283,7 @@ in_getnetaddr(void *v, struct mbuf *name
 {
 	struct inpcb   *inp = v;
 	struct sockaddr_in *sin = mtod(name, struct sockaddr_in *);
-	bzero((void *) sin, sizeof(*sin));
+	memset((void *) sin, 0, sizeof(*sin));
 	switch (which) {
 	case TP_LOCAL:
 		sin->sin_addr = inp->inp_laddr;
@@ -428,7 +428,7 @@ tpip_output_dg(struct mbuf *m0, ...)
 	m->m_len = sizeof(struct ip);
 
 	ip = mtod(m, struct ip *);
-	bzero((void *) ip, sizeof *ip);
+	memset((void *) ip, 0, sizeof *ip);
 
 	ip->ip_p = IPPROTO_TP;
 	if (sizeof(struct ip) + datalen > IP_MAXPACKET) {
Index: sys/netiso/tp_iso.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/tp_iso.c,v
retrieving revision 1.32
diff -u -p -r1.32 tp_iso.c
--- sys/netiso/tp_iso.c	20 Dec 2007 19:53:35 -0000	1.32
+++ sys/netiso/tp_iso.c	19 Dec 2008 18:58:41 -0000
@@ -436,7 +436,7 @@ tpclnp_output_dg(struct mbuf *m0, ...)
 	 *	Fill in minimal portion of isopcb so that clnp can send the
 	 *	packet.
 	 */
-	bzero((void *) & tmppcb, sizeof(tmppcb));
+	memset((void *) & tmppcb, 0, sizeof(tmppcb));
 	tmppcb.isop_laddr = &tmppcb.isop_sladdr;
 	tmppcb.isop_laddr->siso_addr = *laddr;
 	tmppcb.isop_faddr = &tmppcb.isop_sfaddr;
@@ -676,7 +676,7 @@ static struct sockaddr_iso siso = {
 void
 tpclnp_ctlinput1(int cmd, struct iso_addr *isoa)
 {
-	bzero((void *) & siso.siso_addr, sizeof(siso.siso_addr));
+	memset((void *) & siso.siso_addr, 0, sizeof(siso.siso_addr));
 	bcopy((void *) isoa, (void *) & siso.siso_addr, isoa->isoa_len);
 	tpclnp_ctlinput(cmd, (struct sockaddr *) &siso, NULL);
 }
Index: sys/netiso/tp_pcb.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/tp_pcb.c,v
retrieving revision 1.37
diff -u -p -r1.37 tp_pcb.c
--- sys/netiso/tp_pcb.c	17 Dec 2008 20:51:38 -0000	1.37
+++ sys/netiso/tp_pcb.c	19 Dec 2008 18:58:41 -0000
@@ -333,7 +333,7 @@ tp_init(void)
 	tp_start_win = 2;
 
 	tp_timerinit();
-	bzero((void *) & tp_stat, sizeof(struct tp_stat));
+	memset((void *) & tp_stat, 0, sizeof(struct tp_stat));
 }
 
 /*
@@ -538,7 +538,7 @@ tp_getref(struct tp_pcb *tpcb)
 	memcpy(r, obase, size);
 	free(obase, M_PCB);
 	r = (struct tp_ref *)(size + (char *)r);
-	bzero((void *) r, size);
+	memset((void *) r, 0, size);
 
 got_one:
 	r->tpr_pcb = tpcb;
Index: sys/netiso/tp_subr2.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/tp_subr2.c,v
retrieving revision 1.38
diff -u -p -r1.38 tp_subr2.c
--- sys/netiso/tp_subr2.c	23 Apr 2008 09:57:59 -0000	1.38
+++ sys/netiso/tp_subr2.c	19 Dec 2008 18:58:41 -0000
@@ -326,8 +326,8 @@ void
 tp_recycle_tsuffix(void *v)
 {
 	struct tp_pcb  *tpcb = v;
-	bzero((void *) tpcb->tp_lsuffix, sizeof(tpcb->tp_lsuffix));
-	bzero((void *) tpcb->tp_fsuffix, sizeof(tpcb->tp_fsuffix));
+	memset((void *) tpcb->tp_lsuffix, 0, sizeof(tpcb->tp_lsuffix));
+	memset((void *) tpcb->tp_fsuffix, 0, sizeof(tpcb->tp_fsuffix));
 	tpcb->tp_fsuffixlen = tpcb->tp_lsuffixlen = 0;
 
 	(tpcb->tp_nlproto->nlp_recycle_suffix) (tpcb->tp_npcb);
Index: sys/netiso/xebec/procs.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/xebec/procs.c,v
retrieving revision 1.12
diff -u -p -r1.12 procs.c
--- sys/netiso/xebec/procs.c	18 Jan 2007 12:43:38 -0000	1.12
+++ sys/netiso/xebec/procs.c	19 Dec 2008 18:58:41 -0000
@@ -74,7 +74,7 @@ end_events()
 	IFDEBUG(N)
 		fprintf(OUT, "bzero addr %p part %d size %d\n",addr, part, size);
 	ENDDEBUG
-		bzero(addr, part);
+		memset(addr, 0, part);
 	IFDEBUG(N)
 		fprintf(OUT, "after bzero addr %p part %d size %d\n",addr, part, size);
 	ENDDEBUG
Index: sys/netiso/xebec/sets.c
===================================================================
RCS file: /cvsroot/src/sys/netiso/xebec/sets.c,v
retrieving revision 1.11
diff -u -p -r1.11 sets.c
--- sys/netiso/xebec/sets.c	18 Jan 2007 12:43:38 -0000	1.11
+++ sys/netiso/xebec/sets.c	19 Dec 2008 18:58:41 -0000
@@ -298,7 +298,7 @@ int keep;
 	ENDDEBUG
 
 	onew = (struct Object *)Malloc(sizeof (struct Object));
-	bzero(onew, sizeof(struct Object));
+	memset(onew, 0, sizeof(struct Object));
 	onew->obj_name = adr;
 	onew->obj_kind = OBJ_SET;
 	onew->obj_type = type;
@@ -346,7 +346,7 @@ defineitem(type, adr, struc)
 		exit(1);
 	} else {
 		onew = (struct Object *)Malloc(sizeof (struct Object));
-		bzero(onew, sizeof(struct Object));
+		memset(onew, 0, sizeof(struct Object));
 		onew->obj_name = stash(adr);
 		onew->obj_kind = OBJ_ITEM;
 		onew->obj_type =  type;
@@ -378,7 +378,7 @@ member(o, adr)
 		"Warning at line %d: set definition of %s causes definition of\n",
 			lineno, OBJ_NAME(o));
 		fprintf(stderr, "\t (previously undefined) member %s\n", adr);
-		bzero(onew, sizeof(struct Object));
+		memset(onew, 0, sizeof(struct Object));
 		onew->obj_name = stash(adr);
 		onew->obj_kind = OBJ_ITEM;
 		onew->obj_type = o->obj_type;
Index: sys/netkey/key.c
===================================================================
RCS file: /cvsroot/src/sys/netkey/key.c,v
retrieving revision 1.163
diff -u -p -r1.163 key.c
--- sys/netkey/key.c	27 Jul 2008 20:12:47 -0000	1.163
+++ sys/netkey/key.c	19 Dec 2008 18:58:42 -0000
@@ -811,7 +811,7 @@ key_allocsa(
 		/* check src address */
 		switch (family) {
 		case AF_INET:
-			bzero(&sin, sizeof(sin));
+			memset(&sin, 0, sizeof(sin));
 			sin.sin_family = AF_INET;
 			sin.sin_len = sizeof(sin);
 			bcopy(src, &sin.sin_addr,
@@ -827,7 +827,7 @@ key_allocsa(
 			break;
 #ifdef INET6
 		case AF_INET6:
-			bzero(&sin6, sizeof(sin6));
+			memset(&sin6, 0, sizeof(sin6));
 			sin6.sin6_family = AF_INET6;
 			sin6.sin6_len = sizeof(sin6);
 			bcopy(src, &sin6.sin6_addr,
@@ -854,7 +854,7 @@ key_allocsa(
 		/* check dst address */
 		switch (family) {
 		case AF_INET:
-			bzero(&sin, sizeof(sin));
+			memset(&sin, 0, sizeof(sin));
 			sin.sin_family = AF_INET;
 			sin.sin_len = sizeof(sin);
 			bcopy(dst, &sin.sin_addr,
@@ -870,7 +870,7 @@ key_allocsa(
 			break;
 #ifdef INET6
 		case AF_INET6:
-			bzero(&sin6, sizeof(sin6));
+			memset(&sin6, 0, sizeof(sin6));
 			sin6.sin6_family = AF_INET6;
 			sin6.sin6_len = sizeof(sin6);
 			bcopy(dst, &sin6.sin6_addr,
@@ -985,17 +985,17 @@ key_delsav(sav)
 		LIST_REMOVE(sav, spihash);
 
 	if (sav->key_auth != NULL) {
-		bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
+		memset(_KEYBUF(sav->key_auth), 0, _KEYLEN(sav->key_auth));
 		KFREE(sav->key_auth);
 		sav->key_auth = NULL;
 	}
 	if (sav->key_enc != NULL) {
-		bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
+		memset(_KEYBUF(sav->key_enc), 0, _KEYLEN(sav->key_enc));
 		KFREE(sav->key_enc);
 		sav->key_enc = NULL;
 	}
 	if (sav->sched) {
-		bzero(sav->sched, sav->schedlen);
+		memset(sav->sched, 0, sav->schedlen);
 		KFREE(sav->sched);
 		sav->sched = NULL;
 	}
@@ -1268,7 +1268,7 @@ key_msg2sp(xpl0, len, error)
 				*error = ENOBUFS;
 				return NULL;
 			}
-			bzero(*p_isr, sizeof(**p_isr));
+			memset(*p_isr, 0, sizeof(**p_isr));
 
 			/* set values */
 			(*p_isr)->next = NULL;
@@ -1457,7 +1457,7 @@ key_sp2msg(sp)
 	m->m_len = tlen;
 	m->m_next = NULL;
 	xpl = mtod(m, struct sadb_x_policy *);
-	bzero(xpl, tlen);
+	memset(xpl, 0, tlen);
 
 	xpl->sadb_x_policy_len = PFKEY_UNIT64(tlen);
 	xpl->sadb_x_policy_exttype = SADB_X_EXT_POLICY;
@@ -2664,7 +2664,7 @@ key_spdexpire(sp)
 		error = ENOBUFS;
 		goto fail;
 	}
-	bzero(mtod(m, void *), len);
+	memset(mtod(m, void *), 0, len);
 	lt = mtod(m, struct sadb_lifetime *);
 	lt->sadb_lifetime_len = PFKEY_UNIT64(sizeof(struct sadb_lifetime));
 	lt->sadb_lifetime_exttype = SADB_EXT_LIFETIME_CURRENT;
@@ -3306,17 +3306,17 @@ key_setsaval(sav, m, mhp)
 		sav->replay = NULL;
 	}
 	if (sav->key_auth != NULL) {
-		bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
+		memset(_KEYBUF(sav->key_auth), 0, _KEYLEN(sav->key_auth));
 		KFREE(sav->key_auth);
 		sav->key_auth = NULL;
 	}
 	if (sav->key_enc != NULL) {
-		bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
+		memset(_KEYBUF(sav->key_enc), 0, _KEYLEN(sav->key_enc));
 		KFREE(sav->key_enc);
 		sav->key_enc = NULL;
 	}
 	if (sav->sched) {
-		bzero(sav->sched, sav->schedlen);
+		memset(sav->sched, 0, sav->schedlen);
 		KFREE(sav->sched);
 		sav->sched = NULL;
 	}
@@ -3756,7 +3756,7 @@ key_setsadbmsg(type, tlen, satype, seq, 
 
 	p = mtod(m, struct sadb_msg *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_msg_version = PF_KEY_V2;
 	p->sadb_msg_type = type;
 	p->sadb_msg_errno = 0;
@@ -3790,7 +3790,7 @@ key_setsadbsa(sav)
 
 	p = mtod(m, struct sadb_sa *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_sa_len = PFKEY_UNIT64(len);
 	p->sadb_sa_exttype = SADB_EXT_SA;
 	p->sadb_sa_spi = sav->spi;
@@ -3828,7 +3828,7 @@ key_setsadbaddr(exttype, saddr, prefixle
 
 	p = mtod(m, struct sadb_address *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_address_len = PFKEY_UNIT64(len);
 	p->sadb_address_exttype = exttype;
 	p->sadb_address_proto = ul_proto;
@@ -3878,7 +3878,7 @@ key_setsadbident(exttype, idtype, string
 
 	p = mtod(m, struct sadb_ident *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_ident_len = PFKEY_UNIT64(len);
 	p->sadb_ident_exttype = exttype;
 	p->sadb_ident_type = idtype;
@@ -3916,7 +3916,7 @@ key_setsadbxsa2(mode, seq, reqid)
 
 	p = mtod(m, struct sadb_x_sa2 *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_x_sa2_len = PFKEY_UNIT64(len);
 	p->sadb_x_sa2_exttype = SADB_X_EXT_SA2;
 	p->sadb_x_sa2_mode = mode;
@@ -3950,7 +3950,7 @@ key_setsadbxtag(tag)
 
 	p = mtod(m, struct sadb_x_tag *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_x_tag_len = PFKEY_UNIT64(len);
 	p->sadb_x_tag_exttype = SADB_X_EXT_TAG;
 	m_nametag_tag2tagname(tag, p->sadb_x_tag_name);
@@ -3982,7 +3982,7 @@ key_setsadbxtype(type)
 
 	p = mtod(m, struct sadb_x_nat_t_type *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_x_nat_t_type_len = PFKEY_UNIT64(len);
 	p->sadb_x_nat_t_type_exttype = SADB_X_EXT_NAT_T_TYPE;
 	p->sadb_x_nat_t_type_type = type;
@@ -4012,7 +4012,7 @@ key_setsadbxport(port, type)
 
 	p = mtod(m, struct sadb_x_nat_t_port *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_x_nat_t_port_len = PFKEY_UNIT64(len);
 	p->sadb_x_nat_t_port_exttype = type;
 	p->sadb_x_nat_t_port_port = port;
@@ -4137,7 +4137,7 @@ key_setsadblifetime(type, alloc, bytes, 
 
 	p = mtod(m, struct sadb_lifetime *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_lifetime_len = PFKEY_UNIT64(len);
 	p->sadb_lifetime_exttype = type;
 	p->sadb_lifetime_allocations = alloc;
@@ -4171,7 +4171,7 @@ key_setsadbxpolicy(type, dir, id)
 
 	p = mtod(m, struct sadb_x_policy *);
 
-	bzero(p, len);
+	memset(p, 0, len);
 	p->sadb_x_policy_len = PFKEY_UNIT64(len);
 	p->sadb_x_policy_exttype = SADB_X_EXT_POLICY;
 	p->sadb_x_policy_type = type;
@@ -6207,7 +6207,7 @@ key_getcomb_esp()
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
-				bzero(mtod(m, void *), m->m_len);
+				memset(mtod(m, void *), 0, m->m_len);
 			}
 		}
 		if (!m)
@@ -6228,7 +6228,7 @@ key_getcomb_esp()
 				goto fail;
 			}
 			comb = (struct sadb_comb *)(mtod(n, char *) + o);
-			bzero(comb, sizeof(*comb));
+			memset(comb, 0, sizeof(*comb));
 			key_getcomb_setlifetime(comb);
 			comb->sadb_comb_encrypt = i;
 			comb->sadb_comb_encrypt_minbits = encmin;
@@ -6298,7 +6298,7 @@ key_getcomb_ah()
 			return NULL;
 
 		comb = mtod(m, struct sadb_comb *);
-		bzero(comb, sizeof(*comb));
+		memset(comb, 0, sizeof(*comb));
 		key_getcomb_setlifetime(comb);
 		comb->sadb_comb_auth = i;
 		comb->sadb_comb_auth_minbits = xmin;
@@ -6344,7 +6344,7 @@ key_getcomb_ipcomp()
 			return NULL;
 
 		comb = mtod(m, struct sadb_comb *);
-		bzero(comb, sizeof(*comb));
+		memset(comb, 0, sizeof(*comb));
 		key_getcomb_setlifetime(comb);
 		comb->sadb_comb_encrypt = i;
 		/* what should we set into sadb_comb_*_{min,max}bits? */
@@ -6394,7 +6394,7 @@ key_getprop(saidx)
 		totlen += n->m_len;
 
 	prop = mtod(m, struct sadb_prop *);
-	bzero(prop, sizeof(*prop));
+	memset(prop, 0, sizeof(*prop));
 	prop->sadb_prop_len = PFKEY_UNIT64(totlen);
 	prop->sadb_prop_exttype = SADB_EXT_PROPOSAL;
 	prop->sadb_prop_replay = 32;	/* XXX */
@@ -6530,7 +6530,7 @@ key_acquire(saidx, sp)
 
 		fqdnlen = strlen(fqdn) + 1;	/* +1 for terminating-NUL */
 		id = (struct sadb_ident *)p;
-		bzero(id, sizeof(*id) + PFKEY_ALIGN8(fqdnlen));
+		memset(id, 0, sizeof(*id) + PFKEY_ALIGN8(fqdnlen));
 		id->sadb_ident_len = PFKEY_UNIT64(sizeof(*id) + PFKEY_ALIGN8(fqdnlen));
 		id->sadb_ident_exttype = idexttype;
 		id->sadb_ident_type = SADB_IDENTTYPE_FQDN;
@@ -6549,7 +6549,7 @@ key_acquire(saidx, sp)
 		} else
 			userfqdnlen = 0;
 		id = (struct sadb_ident *)p;
-		bzero(id, sizeof(*id) + PFKEY_ALIGN8(userfqdnlen));
+		memset(id, 0, sizeof(*id) + PFKEY_ALIGN8(userfqdnlen));
 		id->sadb_ident_len = PFKEY_UNIT64(sizeof(*id) + PFKEY_ALIGN8(userfqdnlen));
 		id->sadb_ident_exttype = idexttype;
 		id->sadb_ident_type = SADB_IDENTTYPE_USERFQDN;
@@ -6626,7 +6626,7 @@ key_newacq(saidx)
 		ipseclog((LOG_DEBUG, "key_newacq: No more memory.\n"));
 		return NULL;
 	}
-	bzero(newacq, sizeof(*newacq));
+	memset(newacq, 0, sizeof(*newacq));
 
 	/* copy secindex */
 	bcopy(saidx, &newacq->saidx, sizeof(newacq->saidx));
@@ -6681,7 +6681,7 @@ key_newspacq(spidx)
 		ipseclog((LOG_DEBUG, "key_newspacq: No more memory.\n"));
 		return NULL;
 	}
-	bzero(acq, sizeof(*acq));
+	memset(acq, 0, sizeof(*acq));
 
 	/* copy secindex */
 	bcopy(spidx, &acq->spidx, sizeof(acq->spidx));
@@ -6883,7 +6883,7 @@ key_register(so, m, mhp)
 		ipseclog((LOG_DEBUG, "key_register: No more memory.\n"));
 		return key_senderror(so, m, ENOBUFS);
 	}
-	bzero((void *)newreg, sizeof(*newreg));
+	memset((void *)newreg, 0, sizeof(*newreg));
 
 	newreg->so = so;
 	((struct keycb *)sotorawcb(so))->kp_registered++;
@@ -7109,7 +7109,7 @@ key_expire(sav)
 		error = ENOBUFS;
 		goto fail;
 	}
-	bzero(mtod(m, void *), len);
+	memset(mtod(m, void *), 0, len);
 	lt = mtod(m, struct sadb_lifetime *);
 	lt->sadb_lifetime_len = PFKEY_UNIT64(sizeof(struct sadb_lifetime));
 	lt->sadb_lifetime_exttype = SADB_EXT_LIFETIME_CURRENT;
@@ -7882,7 +7882,7 @@ key_align(m, mhp)
 		panic("invalid mbuf passed to key_align");
 
 	/* initialize */
-	bzero(mhp, sizeof(*mhp));
+	memset(mhp, 0, sizeof(*mhp));
 
 	mhp->msg = mtod(m, struct sadb_msg *);
 	mhp->ext[0] = (struct sadb_ext *)mhp->msg;	/*XXX backward compat */
@@ -8045,7 +8045,7 @@ key_do_init(void)
 
 	pfkeystat_percpu = percpu_alloc(sizeof(uint64_t) * PFKEY_NSTATS);
 
-	bzero((void *)&key_cb, sizeof(key_cb));
+	memset((void *)&key_cb, 0, sizeof(key_cb));
 
 	callout_init(&key_timehandler_ch, 0);
 
@@ -8155,7 +8155,7 @@ key_getfqdn()
 		return NULL;
 
 	/* NOTE: hostname may not be NUL-terminated. */
-	bzero(fqdn, sizeof(fqdn));
+	memset(fqdn, 0, sizeof(fqdn));
 	bcopy(hostname, fqdn, hostnamelen);
 	fqdn[hostnamelen] = '\0';
 	return fqdn;
@@ -8178,7 +8178,7 @@ key_getuserfqdn()
 		return NULL;
 
 	/* NOTE: s_login may not be-NUL terminated. */
-	bzero(userfqdn, sizeof(userfqdn));
+	memset(userfqdn, 0, sizeof(userfqdn));
 	bcopy(p->p_pgrp->pg_session->s_login, userfqdn, MAXLOGNAME);
 	userfqdn[MAXLOGNAME] = '\0';	/* safeguard */
 	q = userfqdn + strlen(userfqdn);
Index: sys/netkey/keysock.c
===================================================================
RCS file: /cvsroot/src/sys/netkey/keysock.c,v
retrieving revision 1.48
diff -u -p -r1.48 keysock.c
--- sys/netkey/keysock.c	28 Apr 2008 15:18:43 -0000	1.48
+++ sys/netkey/keysock.c	19 Dec 2008 18:58:42 -0000
@@ -263,7 +263,7 @@ key_sendup0(rp, m, promisc, canwait)
 		m->m_pkthdr.len += sizeof(*pmsg);
 
 		pmsg = mtod(m, struct sadb_msg *);
-		bzero(pmsg, sizeof(*pmsg));
+		memset(pmsg, 0, sizeof(*pmsg));
 		pmsg->sadb_msg_version = PF_KEY_V2;
 		pmsg->sadb_msg_type = SADB_X_PROMISC;
 		pmsg->sadb_msg_len = PFKEY_UNIT64(m->m_pkthdr.len);
Index: sys/netnatm/natm.c
===================================================================
RCS file: /cvsroot/src/sys/netnatm/natm.c,v
retrieving revision 1.18
diff -u -p -r1.18 natm.c
--- sys/netnatm/natm.c	17 Dec 2008 20:51:38 -0000	1.18
+++ sys/netnatm/natm.c	19 Dec 2008 18:58:42 -0000
@@ -274,7 +274,7 @@ struct proc *p;
 
     case PRU_PEERADDR:			/* fetch peer's address */
       snatm = mtod(nam, struct sockaddr_natm *);
-      bzero(snatm, sizeof(*snatm));
+      memset(snatm, 0, sizeof(*snatm));
       nam->m_len = snatm->snatm_len = sizeof(*snatm);
       snatm->snatm_family = AF_NATM;
 #if defined(__NetBSD__) || defined(__OpenBSD__)
Index: sys/netnatm/natm_pcb.c
===================================================================
RCS file: /cvsroot/src/sys/netnatm/natm_pcb.c,v
retrieving revision 1.10
diff -u -p -r1.10 natm_pcb.c
--- sys/netnatm/natm_pcb.c	17 Dec 2008 20:51:38 -0000	1.10
+++ sys/netnatm/natm_pcb.c	19 Dec 2008 18:58:42 -0000
@@ -77,7 +77,7 @@ int wait;
 #endif
 
   if (npcb) {
-    bzero(npcb, sizeof(*npcb));
+    memset(npcb, 0, sizeof(*npcb));
     npcb->npcb_flags = NPCB_FREE;
   }
   return(npcb);
Index: sys/netsmb/smb_conn.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_conn.c,v
retrieving revision 1.24
diff -u -p -r1.24 smb_conn.c
--- sys/netsmb/smb_conn.c	28 Apr 2008 20:24:10 -0000	1.24
+++ sys/netsmb/smb_conn.c	19 Dec 2008 18:58:42 -0000
@@ -712,7 +712,7 @@ smb_vc_getpass(struct smb_vc *vcp)
 static int
 smb_vc_getinfo(struct smb_vc *vcp, struct smb_vc_info *vip)
 {
-	bzero(vip, sizeof(struct smb_vc_info));
+	memset(vip, 0, sizeof(struct smb_vc_info));
 	vip->itype = SMB_INFO_VC;
 	vip->usecount = vcp->obj.co_usecount;
 	vip->uid = vcp->vc_uid;
@@ -721,7 +721,7 @@ smb_vc_getinfo(struct smb_vc *vcp, struc
 	vip->flags = vcp->obj.co_flags;
 	vip->sopt = vcp->vc_sopt;
 	vip->iodstate = vcp->vc_iod->iod_state;
-	bzero(&vip->sopt.sv_skey, sizeof(vip->sopt.sv_skey));
+	memset(&vip->sopt.sv_skey, 0, sizeof(vip->sopt.sv_skey));
 	snprintf(vip->srvname, sizeof(vip->srvname), "%s", vcp->vc_srvname);
 	snprintf(vip->vcname, sizeof(vip->vcname), "%s", vcp->vc_username);
 	return 0;
@@ -909,7 +909,7 @@ smb_share_getpass(struct smb_share *ssp)
 static int
 smb_share_getinfo(struct smb_share *ssp, struct smb_share_info *sip)
 {
-	bzero(sip, sizeof(struct smb_share_info));
+	memset(sip, 0, sizeof(struct smb_share_info));
 	sip->itype = SMB_INFO_SHARE;
 	sip->usecount = ssp->obj.co_usecount;
 	sip->tid  = ssp->ss_tid;
Index: sys/netsmb/smb_crypt.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_crypt.c,v
retrieving revision 1.10
diff -u -p -r1.10 smb_crypt.c
--- sys/netsmb/smb_crypt.c	19 Dec 2008 18:49:39 -0000	1.10
+++ sys/netsmb/smb_crypt.c	19 Dec 2008 18:58:42 -0000
@@ -111,7 +111,7 @@ smb_encrypt(const u_char *apwd, u_char *
 	return 0;
 #else
 	SMBERROR(("password encryption is not available\n"));
-	bzero(RN, 24);
+	memset(RN, 0, 24);
 	return EAUTH;
 #endif
 }
@@ -135,7 +135,7 @@ smb_ntencrypt(const u_char *apwd, u_char
 	MD4Init(ctxp);
 	MD4Update(ctxp, (u_char*)unipwd, len * sizeof(u_int16_t));
 	free(unipwd, M_SMBTEMP);
-	bzero(S21, 21);
+	memset(S21, 0, 21);
 	MD4Final(S21, ctxp);
 	free(ctxp, M_SMBTEMP);
 
@@ -145,7 +145,7 @@ smb_ntencrypt(const u_char *apwd, u_char
 	return 0;
 #else
 	SMBERROR(("password encryption is not available\n"));
-	bzero(RN, 24);
+	memset(RN, 0, 24);
 	return EAUTH;
 #endif
 }
Index: sys/netsmb/smb_dev.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_dev.c,v
retrieving revision 1.29
diff -u -p -r1.29 smb_dev.c
--- sys/netsmb/smb_dev.c	21 Mar 2008 21:55:01 -0000	1.29
+++ sys/netsmb/smb_dev.c	19 Dec 2008 18:58:42 -0000
@@ -204,7 +204,7 @@ nsmb_dev_open(dev_t dev, int oflags, int
 		    NSMB_NAME"%d", dev2unit(dev));
 #endif /* !__NetBSD__ */
 
-	bzero(sdp, sizeof(*sdp));
+	memset(sdp, 0, sizeof(*sdp));
 /*
 	STAILQ_INIT(&sdp->sd_rqlist);
 	STAILQ_INIT(&sdp->sd_rplist);
Index: sys/netsmb/smb_rq.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_rq.c,v
retrieving revision 1.30
diff -u -p -r1.30 smb_rq.c
--- sys/netsmb/smb_rq.c	24 Jun 2008 10:37:19 -0000	1.30
+++ sys/netsmb/smb_rq.c	19 Dec 2008 18:58:42 -0000
@@ -110,7 +110,7 @@ smb_rq_init(struct smb_rq *rqp, struct s
 	int error;
 	struct timeval timo;
 
-	bzero(rqp, sizeof(*rqp));
+	memset(rqp, 0, sizeof(*rqp));
 	smb_sl_init(&rqp->sr_slock, "srslock");
 	error = smb_rq_getenv(layer, &rqp->sr_vc, &rqp->sr_share);
 	if (error)
@@ -417,7 +417,7 @@ smb_t2_init(struct smb_t2rq *t2p, struct
 {
 	int error;
 
-	bzero(t2p, sizeof(*t2p));
+	memset(t2p, 0, sizeof(*t2p));
 	t2p->t2_source = source;
 	t2p->t2_setupcount = 1;
 	t2p->t2_setupdata = t2p->t2_setup;
Index: sys/netsmb/smb_smb.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_smb.c,v
retrieving revision 1.29
diff -u -p -r1.29 smb_smb.c
--- sys/netsmb/smb_smb.c	24 Jun 2008 10:37:19 -0000	1.29
+++ sys/netsmb/smb_smb.c	19 Dec 2008 18:58:42 -0000
@@ -119,7 +119,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st
 	vcp->vc_hflags2 = 0;
 	vcp->obj.co_flags &= ~(SMBV_ENCRYPT);
 	sp = &vcp->vc_sopt;
-	bzero(sp, sizeof(struct smb_sopt));
+	memset(sp, 0, sizeof(struct smb_sopt));
 	error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_NEGOTIATE, scred, &rqp);
 	if (error)
 		return error;
Index: sys/netsmb/smb_trantcp.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.39
diff -u -p -r1.39 smb_trantcp.c
--- sys/netsmb/smb_trantcp.c	17 Dec 2008 20:51:38 -0000	1.39
+++ sys/netsmb/smb_trantcp.c	19 Dec 2008 18:58:42 -0000
@@ -393,7 +393,7 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
 		while (resid > 0) {
 			tm = NULL;
 			rcvflg = MSG_WAITALL;
-			bzero(&auio, sizeof(auio));
+			memset(&auio, 0, sizeof(auio));
 			auio.uio_resid = min(resid, NB_SORECEIVE_CHUNK);
 			/* not need to setup uio_vmspace */
 			resid -= auio.uio_resid;
Index: sys/netsmb/smb_usr.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_usr.c,v
retrieving revision 1.15
diff -u -p -r1.15 smb_usr.c
--- sys/netsmb/smb_usr.c	24 Jun 2008 10:37:19 -0000	1.15
+++ sys/netsmb/smb_usr.c	19 Dec 2008 18:58:42 -0000
@@ -66,7 +66,7 @@ smb_usr_vc2spec(struct smbioc_ossn *dp, 
 {
 	int flags = 0;
 
-	bzero(spec, sizeof(*spec));
+	memset(spec, 0, sizeof(*spec));
 	if (dp->ioc_user[0] == 0)
 		return EINVAL;
 	if (dp->ioc_server == NULL)
@@ -116,7 +116,7 @@ smb_usr_vcspec_free(struct smb_vcspec *s
 static int
 smb_usr_share2spec(struct smbioc_oshare *dp, struct smb_sharespec *spec)
 {
-	bzero(spec, sizeof(*spec));
+	memset(spec, 0, sizeof(*spec));
 	spec->mode = dp->ioc_mode;
 	spec->rights = dp->ioc_rights;
 	spec->owner = dp->ioc_owner;
Index: sys/netsmb/subr_mchain.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/subr_mchain.c,v
retrieving revision 1.15
diff -u -p -r1.15 subr_mchain.c
--- sys/netsmb/subr_mchain.c	24 Jun 2008 10:37:19 -0000	1.15
+++ sys/netsmb/subr_mchain.c	19 Dec 2008 18:58:42 -0000
@@ -138,7 +138,7 @@ mb_init(struct mbchain *mbp)
 void
 mb_initm(struct mbchain *mbp, struct mbuf *m)
 {
-	bzero(mbp, sizeof(*mbp));
+	memset(mbp, 0, sizeof(*mbp));
 	mbp->mb_top = mbp->mb_cur = m;
 	mbp->mb_mleft = M_TRAILINGSPACE(m);
 }
@@ -290,7 +290,7 @@ mb_put_mem(struct mbchain *mbp, const ch
 				return error;
 			break;
 		    case MB_MZERO:
-			bzero(dst, cplen);
+			memset(dst, 0, cplen);
 			break;
 		}
 		size -= cplen;
@@ -373,7 +373,7 @@ md_init(struct mdchain *mdp)
 void
 md_initm(struct mdchain *mdp, struct mbuf *m)
 {
-	bzero(mdp, sizeof(*mdp));
+	memset(mdp, 0, sizeof(*mdp));
 	mdp->md_top = mdp->md_cur = m;
 	mdp->md_pos = mtod(m, u_char*);
 }
Index: sys/opencrypto/crypto.c
===================================================================
RCS file: /cvsroot/src/sys/opencrypto/crypto.c,v
retrieving revision 1.30
diff -u -p -r1.30 crypto.c
--- sys/opencrypto/crypto.c	18 Nov 2008 12:59:58 -0000	1.30
+++ sys/opencrypto/crypto.c	19 Dec 2008 18:58:43 -0000
@@ -411,7 +411,7 @@ crypto_freesession(u_int64_t sid)
 	 */
 	if ((crypto_drivers[hid].cc_flags & CRYPTOCAP_F_CLEANUP) &&
 	    crypto_drivers[hid].cc_sessions == 0)
-		bzero(&crypto_drivers[hid], sizeof(struct cryptocap));
+		memset(&crypto_drivers[hid], 0, sizeof(struct cryptocap));
 
 done:
 	return err;
@@ -610,7 +610,7 @@ crypto_unregister(u_int32_t driverid, in
 
 		if (i == CRYPTO_ALGORITHM_MAX + 1) {
 			ses = cap->cc_sessions;
-			bzero(cap, sizeof(struct cryptocap));
+			memset(cap, 0, sizeof(struct cryptocap));
 			if (ses != 0) {
 				/*
 				 * If there are pending sessions, just mark as invalid.
@@ -653,7 +653,7 @@ crypto_unregister_all(u_int32_t driverid
 			cap->cc_max_op_len[i] = 0;
 		}
 		ses = cap->cc_sessions;
-		bzero(cap, sizeof(struct cryptocap));
+		memset(cap, 0, sizeof(struct cryptocap));
 		if (ses != 0) {
 			/*
 			 * If there are pending sessions, just mark as invalid.
@@ -989,7 +989,7 @@ crypto_getreq(int num)
 	if (crp == NULL) {
 		return NULL;
 	}
-	bzero(crp, sizeof(struct cryptop));
+	memset(crp, 0, sizeof(struct cryptop));
 	cv_init(&crp->crp_cv, "crydev");
 
 	while (num--) {
@@ -999,7 +999,7 @@ crypto_getreq(int num)
 			return NULL;
 		}
 
-		bzero(crd, sizeof(struct cryptodesc));
+		memset(crd, 0, sizeof(struct cryptodesc));
 		crd->crd_next = crp->crp_desc;
 		crp->crp_desc = crd;
 	}
Index: sys/opencrypto/cryptosoft.c
===================================================================
RCS file: /cvsroot/src/sys/opencrypto/cryptosoft.c,v
retrieving revision 1.21
diff -u -p -r1.21 cryptosoft.c
--- sys/opencrypto/cryptosoft.c	17 Dec 2008 20:51:38 -0000	1.21
+++ sys/opencrypto/cryptosoft.c	19 Dec 2008 18:58:43 -0000
@@ -625,7 +625,7 @@ swcr_newsession(void *arg, u_int32_t *si
 			return ENOBUFS;
 		}
 
-		bzero(swd, swcr_sesnum * sizeof(struct swcr_data *));
+		memset(swd, 0, swcr_sesnum * sizeof(struct swcr_data *));
 
 		/* Copy existing sessions */
 		if (swcr_sessions) {
@@ -646,7 +646,7 @@ swcr_newsession(void *arg, u_int32_t *si
 			swcr_freesession(NULL, i);
 			return ENOBUFS;
 		}
-		bzero(*swd, sizeof(struct swcr_data));
+		memset(*swd, 0, sizeof(struct swcr_data));
 
 		switch (cri->cri_alg) {
 		case CRYPTO_DES_CBC:
@@ -864,11 +864,11 @@ swcr_freesession(void *arg, u_int64_t ti
 			axf = swd->sw_axf;
 
 			if (swd->sw_ictx) {
-				bzero(swd->sw_ictx, axf->auth_hash->ctxsize);
+				memset(swd->sw_ictx, 0, axf->auth_hash->ctxsize);
 				free(swd->sw_ictx, M_CRYPTO_DATA);
 			}
 			if (swd->sw_octx) {
-				bzero(swd->sw_octx, axf->auth_hash->ctxsize);
+				memset(swd->sw_octx, 0, axf->auth_hash->ctxsize);
 				free(swd->sw_octx, M_CRYPTO_DATA);
 			}
 			break;
@@ -878,11 +878,11 @@ swcr_freesession(void *arg, u_int64_t ti
 			axf = swd->sw_axf;
 
 			if (swd->sw_ictx) {
-				bzero(swd->sw_ictx, axf->auth_hash->ctxsize);
+				memset(swd->sw_ictx, 0, axf->auth_hash->ctxsize);
 				free(swd->sw_ictx, M_CRYPTO_DATA);
 			}
 			if (swd->sw_octx) {
-				bzero(swd->sw_octx, swd->sw_klen);
+				memset(swd->sw_octx, 0, swd->sw_klen);
 				free(swd->sw_octx, M_CRYPTO_DATA);
 			}
 			break;
Index: sys/opencrypto/cryptosoft_xform.c
===================================================================
RCS file: /cvsroot/src/sys/opencrypto/cryptosoft_xform.c,v
retrieving revision 1.9
diff -u -p -r1.9 cryptosoft_xform.c
--- sys/opencrypto/cryptosoft_xform.c	17 Dec 2008 20:51:38 -0000	1.9
+++ sys/opencrypto/cryptosoft_xform.c	19 Dec 2008 18:58:43 -0000
@@ -339,7 +339,7 @@ des1_setkey(u_int8_t **sched, const u_in
 static void
 des1_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, sizeof (des_key_schedule));
+	memset(*sched, 0, sizeof (des_key_schedule));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -384,7 +384,7 @@ des3_setkey(u_int8_t **sched, const u_in
 static void
 des3_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, 3*sizeof (des_key_schedule));
+	memset(*sched, 0, 3*sizeof (des_key_schedule));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -421,7 +421,7 @@ blf_setkey(u_int8_t **sched, const u_int
 static void
 blf_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, sizeof(BF_KEY));
+	memset(*sched, 0, sizeof(BF_KEY));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -456,7 +456,7 @@ cast5_setkey(u_int8_t **sched, const u_i
 static void
 cast5_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, sizeof(cast128_key));
+	memset(*sched, 0, sizeof(cast128_key));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -505,7 +505,7 @@ skipjack_setkey(u_int8_t **sched, const 
 static void
 skipjack_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, 10 * (sizeof(u_int8_t *) + 0x100));
+	memset(*sched, 0, 10 * (sizeof(u_int8_t *) + 0x100));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -541,7 +541,7 @@ rijndael128_setkey(u_int8_t **sched, con
 static void
 rijndael128_zerokey(u_int8_t **sched)
 {
-	bzero(*sched, sizeof(rijndael_ctx));
+	memset(*sched, 0, sizeof(rijndael_ctx));
 	free(*sched, M_CRYPTO_DATA);
 	*sched = NULL;
 }
@@ -566,7 +566,7 @@ static void
 null_final(u_int8_t *buf, void *ctx)
 {
 	if (buf != (u_int8_t *) 0)
-		bzero(buf, 12);
+		memset(buf, 0, 12);
 }
 
 static int
Index: sys/ufs/ffs/ffs_snapshot.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_snapshot.c,v
retrieving revision 1.89
diff -u -p -r1.89 ffs_snapshot.c
--- sys/ufs/ffs/ffs_snapshot.c	19 Dec 2008 11:36:10 -0000	1.89
+++ sys/ufs/ffs/ffs_snapshot.c	19 Dec 2008 18:58:43 -0000
@@ -1026,7 +1026,7 @@ expunge(struct vnode *snapvp, struct ino
 		dip1->di_blocks = 0;
 		dip1->di_flags =
 		    ufs_rw32(ufs_rw32(dip1->di_flags, ns) & ~SF_SNAPSHOT, ns);
-		bzero(&dip1->di_db[0], (NDADDR + NIADDR) * sizeof(int32_t));
+		memset(&dip1->di_db[0], 0, (NDADDR + NIADDR) * sizeof(int32_t));
 	} else {
 		dip2 = (struct ufs2_dinode *)bp->b_data +
 		    ino_to_fsbo(fs, cancelip->i_number);
@@ -1036,7 +1036,7 @@ expunge(struct vnode *snapvp, struct ino
 		dip2->di_blocks = 0;
 		dip2->di_flags =
 		    ufs_rw32(ufs_rw32(dip2->di_flags, ns) & ~SF_SNAPSHOT, ns);
-		bzero(&dip2->di_db[0], (NDADDR + NIADDR) * sizeof(int64_t));
+		memset(&dip2->di_db[0], 0, (NDADDR + NIADDR) * sizeof(int64_t));
 	}
 	bdwrite(bp);
 	/*
Index: sys/ufs/ffs/ffs_softdep.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_softdep.c,v
retrieving revision 1.116
diff -u -p -r1.116 ffs_softdep.c
--- sys/ufs/ffs/ffs_softdep.c	6 Dec 2008 20:05:55 -0000	1.116
+++ sys/ufs/ffs/ffs_softdep.c	19 Dec 2008 18:58:44 -0000
@@ -917,7 +917,7 @@ top:
 	if (sema_get(&pagedep_in_progress, &bufcache_lock) == 0)
 		goto top;
 	pagedep = pool_cache_get(softdep_medium_cache, PR_WAITOK);
-	bzero(pagedep, sizeof(struct pagedep));
+	memset(pagedep, 0, sizeof(struct pagedep));
 	pagedep->pd_list.wk_type = D_PAGEDEP;
 	pagedep->pd_mnt = mp;
 	pagedep->pd_ino = ip->i_number;
@@ -1220,7 +1220,7 @@ softdep_mount(devvp, mp, fs, cred)
 	    (fs->fs_fmod != 0 && (fs->fs_clean & FS_WASCLEAN)))
 		return (0);
 
-	bzero(&cstotal, sizeof cstotal);
+	memset(&cstotal, 0, sizeof cstotal);
 	for (cyl = 0; cyl < fs->fs_ncg; cyl++) {
 		if ((error = bread(devvp, fsbtodb(fs, cgtod(fs, cyl)),
 		    fs->fs_cgsize, cred, 0, &bp)) != 0) {
@@ -1414,7 +1414,7 @@ softdep_setup_allocdirect(ip, lbn, newbl
 	UVMHIST_FUNC("softdep_setup_allocdirect"); UVMHIST_CALLED(ubchist);
 
 	adp = softdep_alloc(D_ALLOCDIRECT);
-	bzero(adp, sizeof(struct allocdirect));
+	memset(adp, 0, sizeof(struct allocdirect));
 	adp->ad_list.wk_type = D_ALLOCDIRECT;
 	adp->ad_lbn = lbn;
 	adp->ad_newblkno = newblkno;
@@ -1655,7 +1655,7 @@ newallocindir(ip, ptrno, newblkno, oldbl
 	struct allocindir *aip;
 
 	aip = softdep_alloc(D_ALLOCINDIR);
-	bzero(aip, sizeof(struct allocindir));
+	memset(aip, 0, sizeof(struct allocindir));
 	aip->ai_list.wk_type = D_ALLOCINDIR;
 	aip->ai_state = ATTACHED;
 	aip->ai_offset = ptrno;
@@ -1892,7 +1892,7 @@ softdep_setup_freeblocks(
 	if (length != 0)
 		panic("softdep_setup_freeblocks: non-zero length");
 	freeblks = softdep_alloc(D_FREEBLKS);
-	bzero(freeblks, sizeof(struct freeblks));
+	memset(freeblks, 0, sizeof(struct freeblks));
 	freeblks->fb_list.wk_type = D_FREEBLKS;
 	freeblks->fb_uid = ip->i_uid;
 	freeblks->fb_previousinum = ip->i_number;
@@ -2605,7 +2605,7 @@ softdep_setup_directory_add(bp, dp, diro
 	lbn = lblkno(fs, diroffset);
 	offset = blkoff(fs, diroffset);
 	dap = softdep_alloc(D_DIRADD);
-	bzero(dap, sizeof(struct diradd));
+	memset(dap, 0, sizeof(struct diradd));
 	dap->da_list.wk_type = D_DIRADD;
 	dap->da_offset = offset;
 	dap->da_newinum = newinum;
@@ -2906,7 +2906,7 @@ newdirrem(bp, dp, ip, isrmdir, prevdirre
 		panic("newdirrem: whiteout");
 
 	dirrem = softdep_alloc(D_DIRREM);
-	bzero(dirrem, sizeof(struct dirrem));
+	memset(dirrem, 0, sizeof(struct dirrem));
 	dirrem->dm_list.wk_type = D_DIRREM;
 	dirrem->dm_state = isrmdir ? RMDIR : 0;
 	dirrem->dm_mnt = ITOV(ip)->v_mount;
@@ -3028,7 +3028,7 @@ softdep_setup_directory_change(bp, dp, i
 	 */
 	if (newinum != WINO) {
 		dap = softdep_alloc(D_DIRADD);
-		bzero(dap, sizeof(struct diradd));
+		memset(dap, 0, sizeof(struct diradd));
 		dap->da_list.wk_type = D_DIRADD;
 		dap->da_state = DIRCHG | ATTACHED | DEPCOMPLETE;
 		dap->da_offset = offset;
@@ -3504,7 +3504,7 @@ initiate_write_inodeblock_ufs1(inodedep,
 		inodedep->id_savedino1 = inodedep_allocdino(inodedep, bp,
 		    sizeof(struct ufs1_dinode));
 		*inodedep->id_savedino1 = *dp;
-		bzero((void *)dp, sizeof(struct ufs1_dinode));
+		memset((void *)dp, 0, sizeof(struct ufs1_dinode));
 		return;
 	}
 	dp->di_size = ufs_rw64(dp->di_size, needswap);
@@ -3643,7 +3643,7 @@ initiate_write_inodeblock_ufs2(inodedep,
 		inodedep->id_savedino2 = inodedep_allocdino(inodedep, bp,
 		    sizeof(struct ufs2_dinode));
 		*inodedep->id_savedino2 = *dp;
-		bzero((void *)dp, sizeof(struct ufs2_dinode));
+		memset((void *)dp, 0, sizeof(struct ufs2_dinode));
 		return;
 	}
 	dp->di_size = ufs_rw64(dp->di_size, needswap);
Index: sys/ufs/lfs/lfs_balloc.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/lfs/lfs_balloc.c,v
retrieving revision 1.67
diff -u -p -r1.67 lfs_balloc.c
--- sys/ufs/lfs/lfs_balloc.c	16 May 2008 09:22:00 -0000	1.67
+++ sys/ufs/lfs/lfs_balloc.c	19 Dec 2008 18:58:44 -0000
@@ -460,7 +460,7 @@ lfs_fragextend(struct vnode *vp, int osi
 			mutex_exit(&lfs_lock);
 		}
 
-		bzero((char *)((*bpp)->b_data) + osize, (u_int)(nsize - osize));
+		memset((char *)((*bpp)->b_data) + osize, 0, (u_int)(nsize - osize));
 	}
 
     out: