From owner-svn-src-all@FreeBSD.ORG Thu Feb 21 02:40:20 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B67D53B8; Thu, 21 Feb 2013 02:40:20 +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 A8C8CCE9; Thu, 21 Feb 2013 02:40:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1L2eKu8034153; Thu, 21 Feb 2013 02:40:20 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1L2eKOq034145; Thu, 21 Feb 2013 02:40:20 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201302210240.r1L2eKOq034145@svn.freebsd.org> From: Warner Losh Date: Thu, 21 Feb 2013 02:40:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r247070 - head/sys/pci 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2013 02:40:20 -0000 Author: imp Date: Thu Feb 21 02:40:20 2013 New Revision: 247070 URL: http://svnweb.freebsd.org/changeset/base/247070 Log: Most other giant locked storage drivers in the tree don't use splsoftclock to note the need for future locking, so remove it from here. Modified: head/sys/pci/ncr.c Modified: head/sys/pci/ncr.c ============================================================================== --- head/sys/pci/ncr.c Thu Feb 21 02:34:04 2013 (r247069) +++ head/sys/pci/ncr.c Thu Feb 21 02:40:20 2013 (r247070) @@ -6396,12 +6396,8 @@ static nccb_p ncr_get_nccb (ncb_p np, u_long target, u_long lun) { lcb_p lp; - int s; nccb_p cp = NULL; - /* Keep our timeout handler out */ - s = splsoftclock(); - /* ** Lun structure available ? */ @@ -6434,7 +6430,6 @@ static nccb_p ncr_get_nccb } cp->magic = 1; } - splx(s); return (cp); }