svn commit: r213724 - stable/7/sys/sys

[John Baldwin]

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 */