Now that contigfree() does not require Giant, don't grab it in busdma.
This commit is contained in:
parent
980a9b846b
commit
11d905ecd8
@ -458,9 +458,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem))
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -453,9 +453,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
&& dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem))
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -453,9 +453,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
&& dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem))
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -458,9 +458,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem))
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -296,9 +296,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
if (dmat->maxsize <= PAGE_SIZE)
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -653,9 +653,7 @@ nexus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
|
||||
if ((dmat->dt_maxsize <= PAGE_SIZE))
|
||||
free(vaddr, M_DEVBUF);
|
||||
else {
|
||||
mtx_lock(&Giant);
|
||||
contigfree(vaddr, dmat->dt_maxsize, M_DEVBUF);
|
||||
mtx_unlock(&Giant);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user