PERFORCE change 95964 for review

John Birrell jb at FreeBSD.org
Sun Apr 23 23:17:38 UTC 2006


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

Change 95964 by jb at jb_freebsd2 on 2006/04/23 23:17:10

	Comment out some ASSERTs that only work on Solaris.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_actdesc.c#2 edit

Differences ...

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

@@ -8,8 +8,10 @@
 {
 	dtrace_actdesc_t *act;
 
+#if defined(sun)
 	ASSERT(!DTRACEACT_ISPRINTFLIKE(kind) || (arg != NULL &&
 	    arg >= KERNELBASE) || (arg == NULL && kind == DTRACEACT_PRINTA));
+#endif
 
 	act = kmem_zalloc(sizeof (dtrace_actdesc_t), KM_SLEEP);
 	act->dtad_kind = kind;
@@ -45,8 +47,10 @@
 	if (DTRACEACT_ISPRINTFLIKE(kind)) {
 		char *str = (char *)(uintptr_t)act->dtad_arg;
 
+#if defined(sun)
 		ASSERT((str != NULL && (uintptr_t)str >= KERNELBASE) ||
 		    (str == NULL && act->dtad_kind == DTRACEACT_PRINTA));
+#endif
 
 		if (str != NULL)
 			kmem_free(str, strlen(str) + 1);


More information about the p4-projects mailing list