From owner-p4-projects@FreeBSD.ORG  Tue May  9 20:56:42 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 E267716A427; Tue,  9 May 2006 20:56:41 +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 A956116A40A
	for <perforce@freebsd.org>; Tue,  9 May 2006 20:56:41 +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 6554743D5A
	for <perforce@freebsd.org>; Tue,  9 May 2006 20:56:40 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KueeW090283
	for <perforce@freebsd.org>; Tue, 9 May 2006 20:56:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49Kuege090280
	for perforce@freebsd.org; Tue, 9 May 2006 20:56:40 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 9 May 2006 20:56:40 GMT
Message-Id: <200605092056.k49Kuege090280@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 96878 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: Tue, 09 May 2006 20:56:42 -0000

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

Change 96878 by jb@jb_freebsd2 on 2006/05/09 20:56:09

	Don't build the cyclic subsystem in with the KDTRACE. Do it as a
	module because it's supposed to be optional and it's easier to
	load it as a module.

Affected files ...

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

Differences ...

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

@@ -98,7 +98,9 @@
 	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 | kdtrace \
+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"