D33378.id100220.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33378.id100220.diff
View Options

	diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
	--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
	+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
	@@ -98,7 +98,7 @@
	STRFUNC(inet_ntoa((ipaddr_t *)alloca(sizeof (ipaddr_t))))
	STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof (in6_addr_t))))
	STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof (ipaddr_t))))
	-INTFUNC(getf(0))
	+/* INTFUNC(getf(0)) */
	INTFUNC(strtoll("0x12EE5D5", 16))
	STRFUNC(json("{\"systemtap\": false}", "systemtap"))

	diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
	--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
	+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
	@@ -10014,6 +10014,9 @@
	}

	if (subr == DIF_SUBR_GETF) {
	+#ifdef __FreeBSD__
	+ err += efunc(pc, "getf() not supported");
	+#else
	/*
	* If we have a getf() we need to record that
	* in our state. Note that our state can be
	@@ -10024,6 +10027,7 @@
	*/
	if (vstate->dtvs_state != NULL)
	vstate->dtvs_state->dts_getf++;
	+#endif
	}

	break;