From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 21:40:21 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4E6816A405; Mon, 24 Apr 2006 21:40:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A330016A401
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 21:40:21 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B20643D45
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 21:40:21 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3OLeLkZ042952
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 21:40:21 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3OLeLkl042946
	for perforce@freebsd.org; Mon, 24 Apr 2006 21:40:21 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Apr 2006 21:40:21 GMT
Message-Id: <200604242140.k3OLeLkl042946@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 96018 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: Mon, 24 Apr 2006 21:40:22 -0000

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

Change 96018 by jb@jb_freebsd2 on 2006/04/24 21:40:06

	Comment out some Solaris-specific ASSERTs.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#3 (text+ko) ====

@@ -166,7 +166,9 @@
 		 * already held.
 		 */
 		ASSERT(old == dtrace_provider);
+#if defined(sun)
 		ASSERT(dtrace_devi != NULL);
+#endif
 		ASSERT(MUTEX_HELD(&dtrace_provider_lock));
 		ASSERT(MUTEX_HELD(&dtrace_lock));
 		self = 1;
@@ -269,8 +271,10 @@
 	}
 
 	if ((prev = dtrace_provider) == old) {
+#if defined(sun)
 		ASSERT(self || dtrace_devi == NULL);
 		ASSERT(old->dtpv_next == NULL || dtrace_devi == NULL);
+#endif
 		dtrace_provider = old->dtpv_next;
 	} else {
 		while (prev != NULL && prev->dtpv_next != old)