From owner-svn-src-user@FreeBSD.ORG  Fri May 22 22:48:55 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF95D106566B;
	Fri, 22 May 2009 22:48:55 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BEB898FC14;
	Fri, 22 May 2009 22:48:55 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MMmt4Q021296;
	Fri, 22 May 2009 22:48:55 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MMmtBP021295;
	Fri, 22 May 2009 22:48:55 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905222248.n4MMmtBP021295@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 22 May 2009 22:48:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192609 - user/kmacy/releng_7_2_fcs/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 May 2009 22:48:56 -0000

Author: kmacy
Date: Fri May 22 22:48:55 2009
New Revision: 192609
URL: http://svn.freebsd.org/changeset/base/192609

Log:
  enable condvar and friends to operate on spin locks

Modified:
  user/kmacy/releng_7_2_fcs/sys/kern/kern_mutex.c

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_mutex.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_mutex.c	Fri May 22 22:22:21 2009	(r192608)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_mutex.c	Fri May 22 22:48:55 2009	(r192609)
@@ -141,7 +141,7 @@ void
 lock_spin(struct lock_object *lock, int how)
 {
 
-	panic("spin locks can only use msleep_spin");
+	mtx_lock_spin((struct mtx *)lock);
 }
 
 int
@@ -158,8 +158,11 @@ unlock_mtx(struct lock_object *lock)
 int
 unlock_spin(struct lock_object *lock)
 {
+	struct mtx *m;
 
-	panic("spin locks can only use msleep_spin");
+	m = (struct mtx *)lock;
+	mtx_assert(m, MA_OWNED | MA_NOTRECURSED);
+	mtx_unlock_spin(m);
 }
 
 /*