From owner-p4-projects@FreeBSD.ORG  Sun Nov  5 06:56:54 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85A9416A4A0; Sun,  5 Nov 2006 06:56:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3ECE216A492
	for <perforce@freebsd.org>; Sun,  5 Nov 2006 06:56:54 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 35FC543D6A
	for <perforce@freebsd.org>; Sun,  5 Nov 2006 06:56:50 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56uo7H083245
	for <perforce@freebsd.org>; Sun, 5 Nov 2006 06:56:50 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56uoa1083242
	for perforce@freebsd.org; Sun, 5 Nov 2006 06:56:50 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 5 Nov 2006 06:56:50 GMT
Message-Id: <200611050656.kA56uoa1083242@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 109272 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: Sun, 05 Nov 2006 06:56:54 -0000

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

Change 109272 by jb@jb_freebsd8 on 2006/11/05 06:56:12

	Merge the DTrace files back in.

Affected files ...

.. //depot/projects/dtrace/src/sys/conf/files#38 edit

Differences ...

==== //depot/projects/dtrace/src/sys/conf/files#38 (text+ko) ====

@@ -102,6 +102,20 @@
 cam/scsi/scsi_ses.c		optional ses
 cam/scsi/scsi_targ_bh.c		optional targbh
 cam/scsi/scsi_target.c		optional targ
+cddl/dev/dtrace/dtrace.c	optional dtrace | fasttrap \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/dev/dtrace/dtrace_mutex.c	optional dtrace | fasttrap \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/dev/fasttrap/fasttrap.c	optional dtrace | fasttrap \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/kern/cyclic.c		optional cyclic \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/kern/kern_cyclic.c		optional cyclic \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/kern/kmem.c		optional cyclic | kdtrace \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
+cddl/kern/vmem.c		optional cyclic | kdtrace \
+	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
 coda/coda_fbsd.c		optional vcoda
 coda/coda_namecache.c		optional vcoda
 coda/coda_psdev.c		optional vcoda