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

after discussions with beck deraadt kettenis.

9 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index 9507cfe3ffb..d38ad4e22ae 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.32 2014/01/26 17:40:09 miod Exp $ */
+/* $OpenBSD: interrupt.c,v 1.33 2014/07/12 18:44:40 tedu Exp $ */
 /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */
 
 /*-
@@ -586,7 +586,7 @@ softintr_disestablish(void *arg)
 	}
 	mtx_leave(&asi->softintr_mtx);
 
-	free(sih, M_DEVBUF);
+	free(sih, M_DEVBUF, 0);
 }
 
 /*
diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index 3d4f2ad546d..0c9d0c0ff08 100644
--- a/sys/arch/alpha/dev/bus_dma.c
+++ b/sys/arch/alpha/dev/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.32 2014/07/11 09:36:25 mpi Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.33 2014/07/12 18:44:40 tedu Exp $ */
 /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
 
 /*-
@@ -112,7 +112,7 @@ _bus_dmamap_destroy(t, map)
 	bus_dmamap_t map;
 {
 
-	free(map, M_DEVBUF);
+	free(map, M_DEVBUF, 0);
 }
 
 /*
diff --git a/sys/arch/alpha/dev/sgmap_common.c b/sys/arch/alpha/dev/sgmap_common.c
index 11d26b8b48b..af751a93b10 100644
--- a/sys/arch/alpha/dev/sgmap_common.c
+++ b/sys/arch/alpha/dev/sgmap_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgmap_common.c,v 1.12 2014/06/14 23:11:20 jmatthew Exp $ */
+/* $OpenBSD: sgmap_common.c,v 1.13 2014/07/12 18:44:40 tedu Exp $ */
 /* $NetBSD: sgmap_common.c,v 1.13 2000/06/29 09:02:57 mrg Exp $ */
 
 /*-
@@ -187,7 +187,7 @@ void
 alpha_sgmap_dmamap_teardown(map)
 	bus_dmamap_t map;
 {
-	free(map->_dm_cookie, M_DEVBUF);
+	free(map->_dm_cookie, M_DEVBUF, 0);
 }
 
 void
diff --git a/sys/arch/alpha/dev/shared_intr.c b/sys/arch/alpha/dev/shared_intr.c
index 847541c8a9a..c8ef5c2256c 100644
--- a/sys/arch/alpha/dev/shared_intr.c
+++ b/sys/arch/alpha/dev/shared_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shared_intr.c,v 1.18 2011/04/15 20:40:05 deraadt Exp $ */
+/* $OpenBSD: shared_intr.c,v 1.19 2014/07/12 18:44:40 tedu Exp $ */
 /* $NetBSD: shared_intr.c,v 1.13 2000/03/19 01:46:18 thorpej Exp $ */
 
 /*
@@ -196,7 +196,7 @@ alpha_shared_intr_disestablish(intr, cookie)
 	 */
 	evcount_detach(&ih->ih_count);
 	TAILQ_REMOVE(&intr[num].intr_q, ih, ih_q);
-	free(ih, M_DEVBUF);
+	free(ih, M_DEVBUF, 0);
 }
 
 int
diff --git a/sys/arch/alpha/eisa/eisa_machdep.c b/sys/arch/alpha/eisa/eisa_machdep.c
index 40058e7738b..8da7288638d 100644
--- a/sys/arch/alpha/eisa/eisa_machdep.c
+++ b/sys/arch/alpha/eisa/eisa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eisa_machdep.c,v 1.4 2013/07/17 13:57:24 martin Exp $ */
+/* $OpenBSD: eisa_machdep.c,v 1.5 2014/07/12 18:44:40 tedu Exp $ */
 /* $NetBSD: eisa_machdep.c,v 1.1 2000/07/29 23:18:47 thorpej Exp $ */
 
 /*-
@@ -572,8 +572,8 @@ eisa_init(eisa_chipset_tag_t ec)
 		}
 	}
 
-	free(cdata, M_TEMP);
-	free(data, M_TEMP);
+	free(cdata, M_TEMP, 0);
+	free(data, M_TEMP, 0);
 }
 
 /*
diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c
index bb05340dc01..e4cb07fdd71 100644
--- a/sys/arch/alpha/isa/isadma_bounce.c
+++ b/sys/arch/alpha/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma_bounce.c,v 1.10 2010/11/20 20:58:49 miod Exp $	*/
+/*	$OpenBSD: isadma_bounce.c,v 1.11 2014/07/12 18:44:40 tedu Exp $	*/
 /* $NetBSD: isadma_bounce.c,v 1.3 2000/06/29 09:02:57 mrg Exp $ */
 
 /*-
@@ -171,7 +171,7 @@ isadma_bounce_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
  out:
 	if (error) {
 		if (map->_dm_cookie != NULL)
-			free(map->_dm_cookie, M_DEVBUF);
+			free(map->_dm_cookie, M_DEVBUF, 0);
 		_bus_dmamap_destroy(t, map);
 	}
 	return (error);
@@ -191,7 +191,7 @@ isadma_bounce_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
 	if (cookie->id_flags & ID_HAS_BOUNCE)
 		isadma_bounce_free_bouncebuf(t, map);
 
-	free(cookie, M_DEVBUF);
+	free(cookie, M_DEVBUF, 0);
 	_bus_dmamap_destroy(t, map);
 }
 
diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 1683e75160a..2ad6b590749 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.13 2013/11/12 01:37:40 krw Exp $	*/
+/*	$OpenBSD: disk.c,v 1.14 2014/07/12 18:44:41 tedu Exp $	*/
 /*	$NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $	*/
 
 /*
@@ -156,7 +156,7 @@ diskopen(f, ctlr, unit, part)
 
 	if (part >= lp->d_npartitions ||
 	    DL_GETPSIZE(&lp->d_partitions[part]) == 0) {
-bad:		free(sc, sizeof(struct disk_softc));
+bad:		free(sc, sizeof(struct disk_softc), 0);
 		return (ENXIO);
 	}
 	return (0);
@@ -170,7 +170,7 @@ diskclose(f)
 	sc = f->f_devdata;
 	(void)prom_close(sc->sc_fd);
 
-	free(sc, sizeof(struct disk_softc));
+	free(sc, sizeof(struct disk_softc), 0);
 	f->f_devdata = NULL;
 	return (0);
 }
diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c
index 57e039a55b1..9becc1ce7a8 100644
--- a/sys/arch/alpha/stand/installboot.c
+++ b/sys/arch/alpha/stand/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.17 2013/06/11 16:42:06 deraadt Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.18 2014/07/12 18:44:40 tedu Exp $	*/
 /*	$NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $	*/
 
 /*
@@ -258,7 +258,7 @@ loadprotoblocks(char *fname, long *size)
 	}
 	if (read(fd, bp, statbuf.st_size) != statbuf.st_size) {
 		warn("read: %s", fname);
-		free(bp);
+		free(bp, 0);
 		close(fd);
 		return NULL;
 	}
diff --git a/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c b/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c
index 02381d36ff0..30e71e88c5a 100644
--- a/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c
+++ b/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setnetbootinfo.c,v 1.2 2003/05/11 19:41:09 deraadt Exp $	*/
+/*	$OpenBSD: setnetbootinfo.c,v 1.3 2014/07/12 18:44:41 tedu Exp $	*/
 /*	$NetBSD: setnetbootinfo.c,v 1.5 1997/04/06 08:41:37 cgd Exp $	*/
 
 /*
@@ -244,9 +244,9 @@ main(argc, argv)
 		printf("closing %s...\n", outfilename);
 	close(fd);
 
-	free(netbb);
+	free(netbb, 0);
 	if (outfile == NULL)
-		free(outfilename);
+		free(outfilename, 0);
 
 	exit (0);
 }