diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-12 18:44:44 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-12 18:44:44 +0000 |
| commit | 48b6cac396e42c57b5037f5a67d6cd7afb1733d6 (patch) | |
| tree | 29d721c60c102e5fb6ed78e8ad45bbda321c951f /sys/arch/armv7/omap | |
| parent | a29a93ecbd0d69878182d5959b330ae5badcadc7 (diff) | |
add a size argument to free. will be used soon, but for now default to 0.
after discussions with beck deraadt kettenis.
Diffstat (limited to 'sys/arch/armv7/omap')
| -rw-r--r-- | sys/arch/armv7/omap/intc.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omdisplay.c | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omgpio.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c index 82971096c82..8c662a70f05 100644 --- a/sys/arch/armv7/omap/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.2 2013/11/06 19:03:07 syl Exp $ */ +/* $OpenBSD: intc.c,v 1.3 2014/07/12 18:44:41 tedu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -380,7 +380,7 @@ intc_intr_disestablish(void *cookie) TAILQ_REMOVE(&intc_handler[irqno].iq_list, ih, ih_list); if (ih->ih_name != NULL) evcount_detach(&ih->ih_count); - free(ih, M_DEVBUF); + free(ih, M_DEVBUF, 0); restore_interrupts(psw); } diff --git a/sys/arch/armv7/omap/omdisplay.c b/sys/arch/armv7/omap/omdisplay.c index 1a6a31ed852..7fe18c08881 100644 --- a/sys/arch/armv7/omap/omdisplay.c +++ b/sys/arch/armv7/omap/omdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omdisplay.c,v 1.4 2013/12/11 12:51:51 naddy Exp $ */ +/* $OpenBSD: omdisplay.c,v 1.5 2014/07/12 18:44:41 tedu Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> * @@ -1157,7 +1157,7 @@ omdisplay_alloc_screen(void *v, const struct wsscreen_descr *_type, error = omdisplay_new_screen(sc, scr, type->depth); if (error != 0) { - free(scr, M_DEVBUF); + free(scr, M_DEVBUF, 0); return (error); } @@ -1337,7 +1337,7 @@ omdisplay_free_screen(void *v, void *cookie) if (scr->nsegs > 0) bus_dmamem_free(sc->sc_dma_tag, scr->segs, scr->nsegs); - free(scr, M_DEVBUF); + free(scr, M_DEVBUF, 0); } int diff --git a/sys/arch/armv7/omap/omgpio.c b/sys/arch/armv7/omap/omgpio.c index 54138a8d601..66c9f39fa36 100644 --- a/sys/arch/armv7/omap/omgpio.c +++ b/sys/arch/armv7/omap/omgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omgpio.c,v 1.3 2013/11/20 13:32:40 rapha Exp $ */ +/* $OpenBSD: omgpio.c,v 1.4 2014/07/12 18:44:41 tedu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -662,7 +662,7 @@ omgpio_intr_disestablish(struct omgpio_softc *sc, void *cookie) evcount_detach(&ih->ih_count); - free(ih, M_DEVBUF); + free(ih, M_DEVBUF, 0); omgpio_intr_level(gpio, IST_NONE); omgpio_intr_mask(gpio); |