diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
index e8fc9b4dfba1..1324d4eaec4f 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
@@ -1,61 +1,61 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION: make sure probes called from a vfork(2) child fire in the parent
  *
  * SECTION: pid provider
  */
 
 #pragma D option destructive
 
 pid$1:a.out:waiting:entry
 {
 	this->value = (int *)alloca(sizeof (int));
 	*this->value = 1;
 	copyout(this->value, arg0, sizeof (int));
 }
 
 proc:::create
 /pid == $1/
 {
 	child = args[0]->p_pid;
 }
 
 pid$1:a.out:go:
 /child != pid/
 {
 	printf("wrong pid (%d %d)", pid, child);
 	exit(1);
 }
 
-syscall::exit:entry
+syscall::_exit:entry
 /pid == $1/
 {
 	exit(0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
index 30bf5ae4bf0a..64fe885b6124 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
@@ -1,68 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
 	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
-syscall::exit:entry
+syscall::_exit:entry
 /pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
index 7d18442d7408..8b08bface705 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
@@ -1,68 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:return
 /pid == $1/
 {
 	trace("raised");
 	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
-syscall::exit:entry
+syscall::_exit:entry
 /pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
index 30bf5ae4bf0a..64fe885b6124 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
@@ -1,68 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
 	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
-syscall::exit:entry
+syscall::_exit:entry
 /pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }