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

[Mark Johnston]

Author: markj
Date: Wed Jan 11 01:15:55 2017
New Revision: 311909
URL: https://svnweb.freebsd.org/changeset/base/311909

Log:
  Ignore LC_SLEEPABLE when testing whether a mutex is adaptive.
  
  MFC after:	1 week

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	Wed Jan 11 00:50:19 2017	(r311908)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	Wed Jan 11 01:15:55 2017	(r311909)
@@ -4356,9 +4356,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, 
 			break;
 		}
 		l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
-		/* XXX - should be only LC_SLEEPABLE? */
-		regs[rd] = (LOCK_CLASS(l.li)->lc_flags &
-		    (LC_SLEEPLOCK | LC_SLEEPABLE)) != 0;
+		regs[rd] = (LOCK_CLASS(l.li)->lc_flags & LC_SLEEPLOCK) != 0;
 		break;
 
 	case DIF_SUBR_MUTEX_TYPE_SPIN: