summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/dev/apic.c6
-rw-r--r--sys/arch/hppa/dev/astro.c4
-rw-r--r--sys/arch/hppa/gsc/harmony.c6
-rw-r--r--sys/arch/hppa/hppa/intr.c12
-rw-r--r--sys/arch/hppa/hppa/mainbus.c4
-rw-r--r--sys/arch/hppa/stand/libsa/lf.c4
6 files changed, 18 insertions, 18 deletions
diff --git a/sys/arch/hppa/dev/apic.c b/sys/arch/hppa/dev/apic.c
index 0b88d7740f9..475517a2145 100644
--- a/sys/arch/hppa/dev/apic.c
+++ b/sys/arch/hppa/dev/apic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apic.c,v 1.14 2011/05/01 21:59:39 kettenis Exp $ */
+/* $OpenBSD: apic.c,v 1.15 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -171,13 +171,13 @@ apic_intr_establish(void *v, pci_intr_handle_t ih,
aiv = malloc(sizeof(struct apic_iv), M_DEVBUF, M_NOWAIT);
if (aiv == NULL) {
- free(cnt, M_DEVBUF);
+ free(cnt, M_DEVBUF, 0);
return NULL;
}
cnt = malloc(sizeof(struct evcount), M_DEVBUF, M_NOWAIT);
if (!cnt) {
- free(aiv, M_DEVBUF);
+ free(aiv, M_DEVBUF, 0);
return (NULL);
}
diff --git a/sys/arch/hppa/dev/astro.c b/sys/arch/hppa/dev/astro.c
index 802c7ae64b5..8628971f10a 100644
--- a/sys/arch/hppa/dev/astro.c
+++ b/sys/arch/hppa/dev/astro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: astro.c,v 1.14 2014/02/08 20:41:48 kettenis Exp $ */
+/* $OpenBSD: astro.c,v 1.15 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 2007 Mark Kettenis
@@ -620,7 +620,7 @@ iommu_iomap_destroy(struct iommu_map_state *ims)
ims->ims_map.ipm_pagecnt);
#endif
- free(ims, M_DEVBUF);
+ free(ims, M_DEVBUF, 0);
}
/*
diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c
index 30991f0a9ad..2146781d858 100644
--- a/sys/arch/hppa/gsc/harmony.c
+++ b/sys/arch/hppa/gsc/harmony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: harmony.c,v 1.28 2013/05/15 08:29:23 ratchov Exp $ */
+/* $OpenBSD: harmony.c,v 1.29 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 2003 Jason L. Wright (jason@thought.net)
@@ -996,7 +996,7 @@ fail3:
fail2:
bus_dmamap_destroy(sc->sc_dmat, d->d_map);
fail1:
- free(d, pool);
+ free(d, pool, 0);
fail:
return (NULL);
}
@@ -1014,7 +1014,7 @@ harmony_freem(void *vsc, void *ptr, int pool)
bus_dmamem_unmap(sc->sc_dmat, d->d_kva, d->d_size);
bus_dmamem_free(sc->sc_dmat, &d->d_seg, 1);
bus_dmamap_destroy(sc->sc_dmat, d->d_map);
- free(d, pool);
+ free(d, pool, 0);
return;
}
printf("%s: free rogue pointer\n", sc->sc_dv.dv_xname);
diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c
index e51588a7854..69724de7419 100644
--- a/sys/arch/hppa/hppa/intr.c
+++ b/sys/arch/hppa/hppa/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.43 2014/07/08 17:19:24 deraadt Exp $ */
+/* $OpenBSD: intr.c,v 1.44 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -163,7 +163,7 @@ cpu_intr_map(void *v, int pri, int irq, int (*handler)(void *), void *arg,
iv = &ivb[irq];
if (iv->handler) {
if (!pv->share) {
- free(cnt, M_DEVBUF);
+ free(cnt, M_DEVBUF, 0);
return (NULL);
} else {
iv = pv->share;
@@ -224,10 +224,10 @@ cpu_intr_establish(int pri, int irq, int (*handler)(void *), void *arg,
intr_more += 2 * CPU_NINTS;
for (ev = iv->next + CPU_NINTS; ev < intr_more; ev++)
ev->share = iv->share, iv->share = ev;
- free(cnt, M_DEVBUF);
+ free(cnt, M_DEVBUF, 0);
iv->cnt = NULL;
} else if (name == NULL) {
- free(cnt, M_DEVBUF);
+ free(cnt, M_DEVBUF, 0);
iv->cnt = NULL;
} else
evcount_attach(cnt, name, NULL);
@@ -360,7 +360,7 @@ softintr_disestablish(void *cookie)
iv->handler = nv->handler;
iv->arg = nv->arg;
iv->next = nv->next;
- free(nv, M_DEVBUF);
+ free(nv, M_DEVBUF, 0);
return;
} else {
iv->handler = NULL;
@@ -372,7 +372,7 @@ softintr_disestablish(void *cookie)
for (iv = &intr_table[irq]; iv; iv = iv->next) {
if (iv->next == cookie) {
iv->next = iv->next->next;
- free(cookie, M_DEVBUF);
+ free(cookie, M_DEVBUF, 0);
return;
}
}
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c
index 1b56adf65c1..3fa43c00216 100644
--- a/sys/arch/hppa/hppa/mainbus.c
+++ b/sys/arch/hppa/hppa/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.84 2014/05/08 21:32:45 miod Exp $ */
+/* $OpenBSD: mainbus.c,v 1.85 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -760,7 +760,7 @@ mbus_dmamap_destroy(void *v, bus_dmamap_t map)
if (map->dm_mapsize != 0)
mbus_dmamap_unload(v, map);
- free(map, M_DEVBUF);
+ free(map, M_DEVBUF, 0);
}
/*
diff --git a/sys/arch/hppa/stand/libsa/lf.c b/sys/arch/hppa/stand/libsa/lf.c
index fd70310c339..e70b005d80d 100644
--- a/sys/arch/hppa/stand/libsa/lf.c
+++ b/sys/arch/hppa/stand/libsa/lf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lf.c,v 1.8 2013/03/24 19:20:35 deraadt Exp $ */
+/* $OpenBSD: lf.c,v 1.9 2014/07/12 18:44:41 tedu Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -47,7 +47,7 @@ lfopen(struct open_file *f, ...)
int
lfclose(struct open_file *f)
{
- free(f->f_devdata, sizeof(struct hppa_dev));
+ free(f->f_devdata, sizeof(struct hppa_dev), 0);
f->f_devdata = NULL;
return 0;
}