From 7605c12c0f2bf784960d36288b7cb6e451b99a15 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Sun, 15 Apr 2007 08:49:19 +0000
Subject: Remove Giant from CAM.  Drivers (SIMs) now register a mutex that CAM
 will use to synchornize and protect all data objects that are used for that
 SIM.  Drivers that are not yet MPSAFE register Giant and operate as usual. 
 RIght now, no drivers are MPSAFE, though a few will be changed in the coming
 week as this work settles down.

The driver API has changed, so all CAM drivers will need to be recompiled.
The userland API has not changed, so tools like camcontrol do not need to
be recompiled.
---
 sys/pci/ncr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sys/pci')

diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 21f7f85..bcd200c 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -184,6 +184,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 #include <machine/md_var.h>
 #include <machine/bus.h>
@@ -3781,7 +3783,7 @@ ncr_attach (device_t dev)
 	**	about our bus.
 	*/
 	np->sim = cam_sim_alloc(ncr_action, ncr_poll, "ncr", np, np->unit,
-				1, MAX_TAGS, devq);
+				&Giant, 1, MAX_TAGS, devq);
 	if (np->sim == NULL) {
 		cam_simq_free(devq);
 		return ENOMEM;
-- 
cgit v1.1