summaryrefslogtreecommitdiff
path: root/sys/dev/pci/agp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/agp.c')
-rw-r--r--sys/dev/pci/agp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 7661a60dabb..3b515a2ca6a 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.43 2014/03/26 14:41:41 mpi Exp $ */
+/* $OpenBSD: agp.c,v 1.44 2014/07/12 18:48:51 tedu Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
@@ -240,7 +240,7 @@ agp_alloc_gatt(bus_dma_tag_t dmat, u_int32_t apsize)
if (agp_alloc_dmamem(dmat, gatt->ag_size, &gatt->ag_dmamap,
&gatt->ag_physical, &gatt->ag_dmaseg) != 0) {
- free(gatt, M_AGP);
+ free(gatt, M_AGP, 0);
return (NULL);
}
@@ -248,7 +248,7 @@ agp_alloc_gatt(bus_dma_tag_t dmat, u_int32_t apsize)
(caddr_t *)&gatt->ag_virtual, BUS_DMA_NOWAIT) != 0) {
agp_free_dmamem(dmat, gatt->ag_size, gatt->ag_dmamap,
&gatt->ag_dmaseg);
- free(gatt, M_AGP);
+ free(gatt, M_AGP, 0);
return (NULL);
}
@@ -262,7 +262,7 @@ agp_free_gatt(bus_dma_tag_t dmat, struct agp_gatt *gatt)
{
bus_dmamem_unmap(dmat, (caddr_t)gatt->ag_virtual, gatt->ag_size);
agp_free_dmamem(dmat, gatt->ag_size, gatt->ag_dmamap, &gatt->ag_dmaseg);
- free(gatt, M_AGP);
+ free(gatt, M_AGP, 0);
}
int
@@ -340,7 +340,7 @@ agp_generic_alloc_memory(struct agp_softc *sc, int type, vsize_t size)
if (bus_dmamap_create(sc->sc_dmat, size, size / PAGE_SIZE + 1,
size, 0, BUS_DMA_NOWAIT, &mem->am_dmamap) != 0) {
- free(mem, M_AGP);
+ free(mem, M_AGP, 0);
return (NULL);
}
@@ -361,7 +361,7 @@ agp_generic_free_memory(struct agp_softc *sc, struct agp_memory *mem)
sc->sc_allocated -= mem->am_size;
TAILQ_REMOVE(&sc->sc_memory, mem, am_link);
bus_dmamap_destroy(sc->sc_dmat, mem->am_dmamap);
- free(mem, M_AGP);
+ free(mem, M_AGP, 0);
return (0);
}
@@ -401,7 +401,7 @@ agp_generic_bind_memory(struct agp_softc *sc, struct agp_memory *mem,
segs = malloc(nseg * sizeof *segs, M_AGP, M_WAITOK);
if ((error = bus_dmamem_alloc(sc->sc_dmat, mem->am_size, PAGE_SIZE, 0,
segs, nseg, &mem->am_nseg, BUS_DMA_ZERO | BUS_DMA_WAITOK)) != 0) {
- free(segs, M_AGP);
+ free(segs, M_AGP, 0);
rw_exit_write(&sc->sc_lock);
AGP_DPF("bus_dmamem_alloc failed %d\n", error);
return (error);
@@ -409,7 +409,7 @@ agp_generic_bind_memory(struct agp_softc *sc, struct agp_memory *mem,
if ((error = bus_dmamap_load_raw(sc->sc_dmat, mem->am_dmamap, segs,
mem->am_nseg, mem->am_size, BUS_DMA_WAITOK)) != 0) {
bus_dmamem_free(sc->sc_dmat, segs, mem->am_nseg);
- free(segs, M_AGP);
+ free(segs, M_AGP, 0);
rw_exit_write(&sc->sc_lock);
AGP_DPF("bus_dmamap_load failed %d\n", error);
return (error);
@@ -488,7 +488,7 @@ agp_generic_unbind_memory(struct agp_softc *sc, struct agp_memory *mem)
bus_dmamap_unload(sc->sc_dmat, mem->am_dmamap);
bus_dmamem_free(sc->sc_dmat, mem->am_dmaseg, mem->am_nseg);
- free(mem->am_dmaseg, M_AGP);
+ free(mem->am_dmaseg, M_AGP, 0);
mem->am_offset = 0;
mem->am_is_bound = 0;