From owner-p4-projects@FreeBSD.ORG  Sat Jan 12 05:10:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FC2816A41B; Sat, 12 Jan 2008 05:10:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 152A116A418
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 05:10:17 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 12BEF13C455
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 05:10:17 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5AHuX009382
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 05:10:17 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5AG1q009374
	for perforce@freebsd.org; Sat, 12 Jan 2008 05:10:16 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 12 Jan 2008 05:10:16 GMT
Message-Id: <200801120510.m0C5AG1q009374@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133099 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jan 2008 05:10:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=133099

Change 133099 by jb@jb_freebsd1 on 2008/01/12 05:09:19

	Hack to get around asserts where libdtrace delves into private libc
	voodoo on Solaris to check if a mutex is held.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#14 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#14 (text) ====

@@ -848,14 +848,18 @@
 	extern int _rw_write_held(struct _rwlock *);
 	return (_rw_write_held((struct _rwlock *)lock));
 }
+#endif
 
 int
 dt_mutex_held(pthread_mutex_t *lock)
 {
+#if defined(sun)
 	extern int _mutex_held(struct _lwp_mutex *);
 	return (_mutex_held((struct _lwp_mutex *)lock));
+#else
+	return (1);
+#endif
 }
-#endif
 
 static int
 dt_string2str(char *s, char *str, int nbytes)