From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 13 03:13:35 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1631E10656A5;
	Fri, 13 Aug 2010 03:13:35 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 05E298FC1E;
	Fri, 13 Aug 2010 03:13:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7D3DYhT076843;
	Fri, 13 Aug 2010 03:13:34 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D3DYTR076840;
	Fri, 13 Aug 2010 03:13:34 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008130313.o7D3DYTR076840@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 13 Aug 2010 03:13:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211263 - in projects/ofed/head/sys: kern sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 03:13:35 -0000

Author: jeff
Date: Fri Aug 13 03:13:34 2010
New Revision: 211263
URL: http://svn.freebsd.org/changeset/base/211263

Log:
   - Add a sx_init_flags similar to mtx_init flags as well as SX_SYSINIT_FLAGS
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/kern/kern_sx.c
  projects/ofed/head/sys/sys/sx.h

Modified: projects/ofed/head/sys/kern/kern_sx.c
==============================================================================
--- projects/ofed/head/sys/kern/kern_sx.c	Fri Aug 13 03:12:42 2010	(r211262)
+++ projects/ofed/head/sys/kern/kern_sx.c	Fri Aug 13 03:13:34 2010	(r211263)
@@ -195,7 +195,7 @@ sx_sysinit(void *arg)
 {
 	struct sx_args *sargs = arg;
 
-	sx_init(sargs->sa_sx, sargs->sa_desc);
+	sx_init_flags(sargs->sa_sx, sargs->sa_desc, sargs->sa_flags);
 }
 
 void

Modified: projects/ofed/head/sys/sys/sx.h
==============================================================================
--- projects/ofed/head/sys/sys/sx.h	Fri Aug 13 03:12:42 2010	(r211262)
+++ projects/ofed/head/sys/sys/sx.h	Fri Aug 13 03:13:34 2010	(r211263)
@@ -118,18 +118,22 @@ int	sx_chain(struct thread *td, struct t
 struct sx_args {
 	struct sx 	*sa_sx;
 	const char	*sa_desc;
+	int		sa_flags;
 };
 
-#define	SX_SYSINIT(name, sxa, desc)					\
+#define	SX_SYSINIT_FLAGS(name, sxa, desc, flags)			\
 	static struct sx_args name##_args = {				\
 		(sxa),							\
-		(desc)							\
+		(desc),							\
+		(flags)							\
 	};								\
 	SYSINIT(name##_sx_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
 	    sx_sysinit, &name##_args);					\
 	SYSUNINIT(name##_sx_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
 	    sx_destroy, (sxa))
 
+#define	SX_SYSINIT(name, sxa, desc)	SX_SYSINIT_FLAGS(name, sxa, desc, 0)
+
 /*
  * Full lock operations that are suitable to be inlined in non-debug kernels.
  * If the lock can't be acquired or released trivially then the work is