From owner-svn-src-head@FreeBSD.ORG  Wed Sep 29 13:24:57 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4EC3D106566B;
	Wed, 29 Sep 2010 13:24:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EA038FC14;
	Wed, 29 Sep 2010 13:24:57 +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 o8TDOvtm010376;
	Wed, 29 Sep 2010 13:24:57 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8TDOvwZ010374;
	Wed, 29 Sep 2010 13:24:57 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201009291324.o8TDOvwZ010374@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 29 Sep 2010 13:24:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213271 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Sep 2010 13:24:57 -0000

Author: jhb
Date: Wed Sep 29 13:24:56 2010
New Revision: 213271
URL: http://svn.freebsd.org/changeset/base/213271

Log:
  Account for unlocking a spin mutex in the lock profiling code in the !SMP
  case.
  
  Submitted by:	truckman
  MFC after:	3 days

Modified:
  head/sys/sys/mutex.h

Modified: head/sys/sys/mutex.h
==============================================================================
--- head/sys/sys/mutex.h	Wed Sep 29 13:08:23 2010	(r213270)
+++ head/sys/sys/mutex.h	Wed Sep 29 13:24:56 2010	(r213271)
@@ -251,8 +251,11 @@ void	_thread_lock_flags(struct thread *,
 #define _rel_spin_lock(mp) do {						\
 	if (mtx_recursed((mp)))						\
 		(mp)->mtx_recurse--;					\
-	else								\
+	else {								\
+		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_SPIN_UNLOCK_RELEASE, \
+			mp);						\
 		(mp)->mtx_lock = MTX_UNOWNED;				\
+	}                                                               \
 	spinlock_exit();						\
 } while (0)
 #endif /* SMP */