From owner-svn-src-projects@FreeBSD.ORG  Thu Jul 29 02:20:20 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 8D219106566C;
	Thu, 29 Jul 2010 02:20:20 +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 7C9CC8FC15;
	Thu, 29 Jul 2010 02:20:20 +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 o6T2KKnP001430;
	Thu, 29 Jul 2010 02:20:20 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6T2KKR0001413;
	Thu, 29 Jul 2010 02:20:20 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201007290220.o6T2KKR0001413@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Thu, 29 Jul 2010 02:20:20 +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: r210590 - projects/ofed/head/sys/ofed/include/linux
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: Thu, 29 Jul 2010 02:20:20 -0000

Author: jeff
Date: Thu Jul 29 02:20:20 2010
New Revision: 210590
URL: http://svn.freebsd.org/changeset/base/210590

Log:
   - Use a unique name for spinlocks so witness does not panic.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/spinlock.h

Modified: projects/ofed/head/sys/ofed/include/linux/spinlock.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/spinlock.h	Thu Jul 29 02:16:16 2010	(r210589)
+++ projects/ofed/head/sys/ofed/include/linux/spinlock.h	Thu Jul 29 02:20:20 2010	(r210590)
@@ -42,7 +42,8 @@ typedef struct {
 	struct mtx m;
 } spinlock_t;
 
-#define	spin_lock_init(_l)	mtx_init(&(_l)->m, "ldev", NULL, MTX_DEF)
+#define	spin_lock_init(_l)	mtx_init(&(_l)->m, "lnxspin", NULL,	\
+				    MTX_DEF | MTX_NOWITNESS)
 #define	spin_lock(_l)		mtx_lock(&(_l)->m)
 #define	spin_unlock(_l)		mtx_unlock(&(_l)->m)
 #define	spin_lock_nested(_l, _n) mtx_lock_flags(&(_l)->m, MTX_DUPOK)
@@ -55,6 +56,6 @@ typedef struct {
 
 #define	DEFINE_SPINLOCK(lock)						\
 	spinlock_t lock;						\
-	MTX_SYSINIT(lock, &(lock).m, "ldev", MTX_DEF)
+	MTX_SYSINIT(lock, &(lock).m, "lnxspin", MTX_DEF)
 
 #endif	/* _LINUX_SPINLOCK_H_ */