diff options
author | mux <mux@FreeBSD.org> | 2003-03-13 17:10:54 +0000 |
---|---|---|
committer | mux <mux@FreeBSD.org> | 2003-03-13 17:10:54 +0000 |
commit | d3ce48cb48061b92b1b7ac962379bf631017e7b1 (patch) | |
tree | 6e8a272b5972c1eb487fdd96b5d013d3731c90bf | |
parent | 48bb025c583d55ca6a62180b3bcf8b04f7117505 (diff) | |
download | FreeBSD-src-d3ce48cb48061b92b1b7ac962379bf631017e7b1.zip FreeBSD-src-d3ce48cb48061b92b1b7ac962379bf631017e7b1.tar.gz |
Memory allocated with contigmalloc() should be freed with
contigfree(), not with free().
-rw-r--r-- | sys/ia64/ia64/busdma_machdep.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c index fa0b08d..e7c38be 100644 --- a/sys/ia64/ia64/busdma_machdep.c +++ b/sys/ia64/ia64/busdma_machdep.c @@ -377,7 +377,10 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) */ if (map != &nobounce_dmamap) panic("bus_dmamem_free: Invalid map freed\n"); - free(vaddr, M_DEVBUF); + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) + free(vaddr, M_DEVBUF); + else + contigfree(vaddr, dmat->maxsize, M_DEVBUF); } #define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1) |