svn commit: r212465 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace

[Rui Paulo]

Author: rpaulo
Date: Sat Sep 11 12:58:31 2010
New Revision: 212465
URL: http://svn.freebsd.org/changeset/base/212465

Log:
  Avoid a LOR (sleepable after non-sleepable) in
  fasttrap_tracepoint_enable().
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Sat Sep 11 12:51:01 2010	(r212464)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Sat Sep 11 12:58:31 2010	(r212465)
@@ -591,7 +591,9 @@ fasttrap_tracepoint_enable(proc_t *p, fa
 	 * Before we make any modifications, make sure we've imposed a barrier
 	 * on the generation in which this probe was last modified.
 	 */
+	PROC_UNLOCK(p);
 	fasttrap_mod_barrier(probe->ftp_gen);
+	PROC_LOCK(p);
 
 	bucket = &fasttrap_tpoints.fth_table[FASTTRAP_TPOINTS_INDEX(pid, pc)];