summaryrefslogtreecommitdiffstats
path: root/sys/dev/buslogic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/buslogic')
-rw-r--r--sys/dev/buslogic/bt.c10
-rw-r--r--sys/dev/buslogic/bt_eisa.c4
-rw-r--r--sys/dev/buslogic/bt_isa.c6
-rw-r--r--sys/dev/buslogic/bt_mca.c6
-rw-r--r--sys/dev/buslogic/bt_pci.c4
5 files changed, 30 insertions, 0 deletions
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 4944a07..da8d017 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -45,6 +45,8 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
@@ -723,6 +725,8 @@ bt_init(device_t dev)
/* nsegments */ BT_NSEG,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ BUS_DMA_ALLOCNOW,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->buffer_dmat) != 0) {
goto error_exit;
}
@@ -742,6 +746,8 @@ bt_init(device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->mailbox_dmat) != 0) {
goto error_exit;
}
@@ -782,6 +788,8 @@ bt_init(device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->ccb_dmat) != 0) {
goto error_exit;
}
@@ -816,6 +824,8 @@ bt_init(device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->sg_dmat) != 0) {
goto error_exit;
}
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index e9c1965..e03e8d4 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -33,6 +33,8 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <machine/bus_pio.h>
@@ -313,6 +315,8 @@ bt_eisa_attach(device_t dev)
/* nsegments */ ~0,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg, */ &Giant,
&bt->parent_dmat) != 0) {
bt_eisa_release_resources(dev);
return -1;
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index f76aa16..305d02e 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -33,6 +33,8 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <machine/bus_pio.h>
@@ -243,6 +245,8 @@ bt_isa_attach(device_t dev)
/* nsegments */ ~0,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->parent_dmat) != 0) {
bt_isa_release_resources(dev);
return (ENOMEM);
@@ -269,6 +273,8 @@ bt_isa_attach(device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->sense_dmat) != 0) {
bt_isa_release_resources(dev);
return (ENOMEM);
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index cf237e1..acaab29 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.c
@@ -37,6 +37,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <machine/cpufunc.h>
#include <machine/md_var.h>
@@ -228,6 +230,8 @@ bt_mca_attach (device_t dev)
/* nsegments */ ~0,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->parent_dmat) != 0) {
bt_mca_release_resources(dev);
return (ENOMEM);
@@ -251,6 +255,8 @@ bt_mca_attach (device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->sense_dmat) != 0) {
bt_mca_release_resources(dev);
return (ENOMEM);
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index f2f6158..2e10020 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -32,6 +32,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <pci/pcireg.h>
@@ -184,6 +186,8 @@ bt_pci_attach(device_t dev)
/* nsegments */ ~0,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
+ /* lockfunc */ busdma_lock_mutex,
+ /* lockarg */ &Giant,
&bt->parent_dmat) != 0) {
bt_pci_release_resources(dev);
return (ENOMEM);
OpenPOWER on IntegriCloud