add a size argument to free. will be used soon, but for now default to 0.

after discussions with beck deraadt kettenis.

7 files changed, 23 insertions, 23 deletions

diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 7527427742a..e159e700bd7 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.99 2014/06/15 11:43:24 sf Exp $	*/
+/*	$OpenBSD: fd.c,v 1.100 2014/07/12 18:48:17 tedu Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -1014,7 +1014,7 @@ fdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 		lp = malloc(sizeof(*lp), M_TEMP, M_WAITOK);
 		fdgetdisklabel(dev, fd, lp, 0);
 		bcopy(lp, fd->sc_dk.dk_label, sizeof(*lp));
-		free(lp, M_TEMP);
+		free(lp, M_TEMP, 0);
 		return 0;
 
 	case DIOCGPDINFO:
@@ -1113,6 +1113,6 @@ fdformat(dev_t dev, struct fd_formb *finfo, struct proc *p)
 
         /* ...and wait for it to complete */
 	rv = biowait(bp);
-        free(bp, M_TEMP);
+        free(bp, M_TEMP, 0);
         return (rv);
 }
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 1fa77ae8833..4358c94b90d 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus.c,v 1.39 2013/11/15 16:46:27 brad Exp $	*/
+/*	$OpenBSD: gus.c,v 1.40 2014/07/12 18:48:17 tedu Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -618,7 +618,7 @@ gusclose(void *addr)
 	sc->sc_flags &= ~(GUS_OPEN|GUS_LOCKED|GUS_DMAOUT_ACTIVE|GUS_DMAIN_ACTIVE);
 
 	if (sc->sc_deintr_buf) {
-		free(sc->sc_deintr_buf, M_DEVBUF);
+		free(sc->sc_deintr_buf, M_DEVBUF, 0);
 		sc->sc_deintr_buf = NULL;
 	}
 	/* turn off speaker, etc. */
@@ -1579,7 +1579,7 @@ gus_round_blocksize(addr, blocksize)
 	/* set up temporary buffer to hold the deinterleave, if necessary
 	   for stereo output */
 	if (sc->sc_deintr_buf) {
-		free(sc->sc_deintr_buf, M_DEVBUF);
+		free(sc->sc_deintr_buf, M_DEVBUF, 0);
 		sc->sc_deintr_buf = NULL;
 	}
 	sc->sc_deintr_buf = malloc(blocksize/2, M_DEVBUF, M_WAITOK);
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index f817620e328..5def3845b83 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa.c,v 1.41 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: isa.c,v 1.42 2014/07/12 18:48:18 tedu Exp $	*/
 /*	$NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $	*/
 
 /*
@@ -240,7 +240,7 @@ isascan(parent, match)
 		if (autoconf_verbose)
 			printf(">>> probing for %s* finished\n",
 			    cf->cf_driver->cd_name);
-		free(dev, M_DEVBUF);
+		free(dev, M_DEVBUF, 0);
 		return;
 	}
 
@@ -253,7 +253,7 @@ isascan(parent, match)
 		    !isa_intr_check(sc->sc_ic, ia.ia_irq, IST_EDGE)) {
 			printf("%s%d: irq %d already in use\n",
 			    cf->cf_driver->cd_name, cf->cf_unit, ia.ia_irq);
-			free(dev, M_DEVBUF);
+			free(dev, M_DEVBUF, 0);
 		} else {
 #endif
 			if (autoconf_verbose)
@@ -274,7 +274,7 @@ isascan(parent, match)
 		if (autoconf_verbose)
 			printf(">>> probing for %s%d failed\n",
 			    cf->cf_driver->cd_name, cf->cf_unit);
-		free(dev, M_DEVBUF);
+		free(dev, M_DEVBUF, 0);
 	}
 }
 
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 0099c74c9d7..74b73896a44 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma.c,v 1.31 2008/06/26 05:42:16 ray Exp $	*/
+/*	$OpenBSD: isadma.c,v 1.32 2014/07/12 18:48:18 tedu Exp $	*/
 /*	$NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $	*/
 
 /*-
@@ -719,7 +719,7 @@ isa_free(addr, pool)
 	*mp = m->next;
 	isa_dmamem_unmap(m->isadev, m->chan, kva, m->size);
 	isa_dmamem_free(m->isadev, m->chan, m->addr, m->size);
-	free(m, pool);
+	free(m, pool, 0);
 }
 
 paddr_t
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index c29feb8c056..2b5911aec54 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp.c,v 1.40 2011/06/29 12:17:40 tedu Exp $	*/
+/*	$OpenBSD: isapnp.c,v 1.41 2014/07/12 18:48:18 tedu Exp $	*/
 /*	$NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $	*/
 
 /*
@@ -427,7 +427,7 @@ isapnp_bestconfig(isa, sc, ipa)
 				return best;
 			}
 
-			free(best, M_DEVBUF);
+			free(best, M_DEVBUF, 0);
 			continue;
 		}
 		else {
@@ -439,7 +439,7 @@ isapnp_bestconfig(isa, sc, ipa)
 					continue;
 				d = c->ipa_sibling;
 				if (SAMEDEV(c, best))
-					free(c, M_DEVBUF);
+					free(c, M_DEVBUF, 0);
 				else {
 					if (n)
 						n->ipa_sibling = c;
@@ -923,7 +923,7 @@ isapnp_attach(parent, self, aux)
 			if (lpa->ipa_pref == ISAPNP_DEP_CONFLICTING) {
 				isapnp_print(lpa, self->dv_xname);
 				printf(" resource conflict\n");
-				free(lpa, M_DEVBUF);
+				free(lpa, M_DEVBUF, 0);
 				continue;
 			}
 
@@ -948,7 +948,7 @@ isapnp_attach(parent, self, aux)
 				printf(" not configured\n");
 				isapnp_write_reg(sc, ISAPNP_ACTIVATE, 0);
 			}
-			free(lpa, M_DEVBUF);
+			free(lpa, M_DEVBUF, 0);
 		}
 		isapnp_write_reg(sc, ISAPNP_WAKE, 0);    /* Good night cards */
 	}
diff --git a/sys/dev/isa/isapnpres.c b/sys/dev/isa/isapnpres.c
index a45b0c654e4..5c5a82beb18 100644
--- a/sys/dev/isa/isapnpres.c
+++ b/sys/dev/isa/isapnpres.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnpres.c,v 1.8 2013/11/15 16:46:27 brad Exp $	*/
+/*	$OpenBSD: isapnpres.c,v 1.9 2014/07/12 18:48:18 tedu Exp $	*/
 /*	$NetBSD: isapnpres.c,v 1.7.4.1 1997/11/20 07:46:13 mellon Exp $	*/
 
 /*
@@ -177,7 +177,7 @@ isapnp_flatten(struct isa_attach_args *card)
 	struct isa_attach_args *dev, *conf, *d, *c, *pa;
 
 	dev = card->ipa_child;
-	free(card, M_DEVBUF);
+	free(card, M_DEVBUF, 0);
 
 	for (conf = c = NULL, d = dev; d; d = dev) {
 		dev = d->ipa_sibling;
@@ -198,7 +198,7 @@ isapnp_flatten(struct isa_attach_args *card)
 				isapnp_merge(pa, d);
 
 			pa = d->ipa_child;
-			free(d, M_DEVBUF);
+			free(d, M_DEVBUF, 0);
 		}
 
 		if (c == NULL)
@@ -514,7 +514,7 @@ parse:
 bad:
 	for (card = isapnp_flatten(card); card; ) {
 		dev = card->ipa_sibling;
-		free(card, M_DEVBUF);
+		free(card, M_DEVBUF, 0);
 		card = dev;
 	}
 	printf("%s: %s, card %d\n", sc->sc_dev.dv_xname,
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 8e9d022fe2a..085eb98a769 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spkr.c,v 1.15 2014/07/10 14:21:20 deraadt Exp $	*/
+/*	$OpenBSD: spkr.c,v 1.16 2014/07/12 18:48:18 tedu Exp $	*/
 /*	$NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $	*/
 
 /*
@@ -452,7 +452,7 @@ spkrclose(dev_t dev, int flags, int mode, struct proc *p)
 		return (ENXIO);
 	else {
 		tone(0, 0);
-		free(spkr_inbuf, M_DEVBUF);
+		free(spkr_inbuf, M_DEVBUF, 0);
 		spkr_active = 0;
 	}
 	return (0);