From owner-svn-src-stable-7@FreeBSD.ORG  Tue Oct 12 15:48:28 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F34541065698;
	Tue, 12 Oct 2010 15:48:27 +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 E105E8FC24;
	Tue, 12 Oct 2010 15:48:27 +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 o9CFmRZe052199;
	Tue, 12 Oct 2010 15:48:27 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9CFmR7Q052197;
	Tue, 12 Oct 2010 15:48:27 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201010121548.o9CFmR7Q052197@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Oct 2010 15:48:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213724 - stable/7/sys/sys
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Oct 2010 15:48:28 -0000

Author: jhb
Date: Tue Oct 12 15:48:27 2010
New Revision: 213724
URL: http://svn.freebsd.org/changeset/base/213724

Log:
  MFC 213271:
  Account for unlocking a spin mutex in the lock profiling code in the !SMP
  case.

Modified:
  stable/7/sys/sys/mutex.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sys/mutex.h
==============================================================================
--- stable/7/sys/sys/mutex.h	Tue Oct 12 15:48:14 2010	(r213723)
+++ stable/7/sys/sys/mutex.h	Tue Oct 12 15:48:27 2010	(r213724)
@@ -247,8 +247,10 @@ void	_thread_lock_flags(struct thread *,
 #define _rel_spin_lock(mp) do {						\
 	if (mtx_recursed((mp)))						\
 		(mp)->mtx_recurse--;					\
-	else								\
+	else {								\
+		lock_profile_release_lock(&(mp)->lock_object);          \
 		(mp)->mtx_lock = MTX_UNOWNED;				\
+	}                                                               \
 	spinlock_exit();						\
 } while (0)
 #endif /* SMP */