From owner-p4-projects@FreeBSD.ORG  Wed Jan 30 05:42:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F90616A41A; Wed, 30 Jan 2008 05:42:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BC6316A417
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 05:42:39 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2334913C43E
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 05:42:39 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5gdHd086697
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 05:42:39 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5gcmS086694
	for perforce@freebsd.org; Wed, 30 Jan 2008 05:42:38 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 30 Jan 2008 05:42:38 GMT
Message-Id: <200801300542.m0U5gcmS086694@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 134444 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: Wed, 30 Jan 2008 05:42:39 -0000

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

Change 134444 by jb@jb_freebsd1 on 2008/01/30 05:42:24

	Add the kernel options #ifdefs which I missed before.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#25 edit
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#18 edit
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#28 edit

Differences ...

==== //depot/projects/dtrace/src/sys/kern/kern_exec.c#25 (text+ko) ====

@@ -672,12 +672,14 @@
 	textvp = p->p_textvp;
 	p->p_textvp = ndp->ni_vp;
 
+#ifdef KDTRACE_HOOKS
 	/*
 	 * Tell the DTrace fasttrap provider about the exec if it
 	 * has declared an interest.
 	 */
 	if (dtrace_fasttrap_exec)
 		dtrace_fasttrap_exec(p);
+#endif
 
 	/*
 	 * Notify others that we exec'd, and clear the P_INEXEC flag

==== //depot/projects/dtrace/src/sys/kern/kern_exit.c#18 (text+ko) ====

@@ -460,12 +460,14 @@
 	p->p_xstat = rv;
 	p->p_xthread = td;
 
+#ifdef KDTRACE_HOOKS
 	/*
 	 * Tell the DTrace fasttrap provider about the exit if it
 	 * has declared an interest.
 	 */
 	if (dtrace_fasttrap_exit)
 		dtrace_fasttrap_exit(p);
+#endif
 
 	/*
 	 * Notify interested parties of our demise.

==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#28 (text+ko) ====

@@ -639,12 +639,14 @@
 		p2->p_pfsflags = p1->p_pfsflags;
 	}
 
+#ifdef KDTRACE_HOOKS
 	/*
 	 * Tell the DTrace fasttrap provider about the new process
 	 * if it has registered an interest.
 	 */
 	if (dtrace_fasttrap_fork)
 		dtrace_fasttrap_fork(p1, p2);
+#endif
 
 	/*
 	 * This begins the section where we must prevent the parent