PERFORCE change 96018 for review

John Birrell jb at FreeBSD.org
Mon Apr 24 21:40:22 UTC 2006


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

Change 96018 by jb at 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)


More information about the p4-projects mailing list