From owner-svn-src-all@FreeBSD.ORG  Thu Feb 21 17:50:22 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 64B57C1A;
 Thu, 21 Feb 2013 17:50:22 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 57AD6ABF;
 Thu, 21 Feb 2013 17:50:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1LHoM46011623;
 Thu, 21 Feb 2013 17:50:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1LHoMrT011622;
 Thu, 21 Feb 2013 17:50:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201302211750.r1LHoMrT011622@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 21 Feb 2013 17:50:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247109 - head/sys/dev/firewire
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 17:50:22 -0000

Author: imp
Date: Thu Feb 21 17:50:21 2013
New Revision: 247109
URL: http://svnweb.freebsd.org/changeset/base/247109

Log:
  bus_dmamap_load_ccb doesn't exist on earlier versions of FreeBSD or
  DragonFlyBSD, so it certainly doesn't need splsoftvm(). Remove it.
  
  # I doubt this driver will now compile on older FreeBSD versions or DFBSD
  # We should consider unifdefing it since that code seems unmaintained.

Modified:
  head/sys/dev/firewire/sbp.c

Modified: head/sys/dev/firewire/sbp.c
==============================================================================
--- head/sys/dev/firewire/sbp.c	Thu Feb 21 17:40:59 2013	(r247108)
+++ head/sys/dev/firewire/sbp.c	Thu Feb 21 17:50:21 2013	(r247109)
@@ -2488,16 +2488,14 @@ printf("ORB %08x %08x %08x %08x\n", ntoh
 printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[4]), ntohl(ocb->orb[5]), ntohl(ocb->orb[6]), ntohl(ocb->orb[7]));
 */
 		if (ccb->csio.dxfer_len > 0) {
-			int s, error;
+			int error;
 
-			s = splsoftvm();
 			error = bus_dmamap_load_ccb(/*dma tag*/sbp->dmat,
 					/*dma map*/ocb->dmamap,
 					ccb,
 					sbp_execute_ocb,
 					ocb,
 					/*flags*/0);
-			splx(s);
 			if (error)
 				printf("sbp: bus_dmamap_load error %d\n", error);
 		} else