summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2004-03-13 15:42:59 +0000
committerscottl <scottl@FreeBSD.org>2004-03-13 15:42:59 +0000
commitd4f628402f68f464794e5ef08d1ebe3ac8d09079 (patch)
tree573c8349e7bc94735146f4b69b1ba6f516603a11 /sys
parente2a63a243ee97baac28a491ae1138ce3baae75a9 (diff)
downloadFreeBSD-src-d4f628402f68f464794e5ef08d1ebe3ac8d09079.zip
FreeBSD-src-d4f628402f68f464794e5ef08d1ebe3ac8d09079.tar.gz
Now that contigfree() does not require Giant, don't grab it in busdma.
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/busdma_machdep.c2
-rw-r--r--sys/amd64/amd64/busdma_machdep.c2
-rw-r--r--sys/i386/i386/busdma_machdep.c2
-rw-r--r--sys/ia64/ia64/busdma_machdep.c2
-rw-r--r--sys/powerpc/powerpc/busdma_machdep.c2
-rw-r--r--sys/sparc64/sparc64/bus_machdep.c2
6 files changed, 0 insertions, 12 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index 279d3a6..7b9a185 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -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);
}
}
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index da1d950..54c60e5 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -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);
}
}
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index da1d950..54c60e5 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -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);
}
}
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 29ade1f..732b751 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -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);
}
}
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 829d29ab..a97c535 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -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);
}
}
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 47890c4..eed9e08 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -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);
}
}
OpenPOWER on IntegriCloud