From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 06:58:16 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 67B5116A406; Fri, 21 Apr 2006 06:58:16 +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 4581716A404
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:58:16 +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 D68CA43D4C
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:58:15 +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 k3L6wFMc037488
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:58:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3L6wFTW037483
	for perforce@freebsd.org; Fri, 21 Apr 2006 06:58:15 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 21 Apr 2006 06:58:15 GMT
Message-Id: <200604210658.k3L6wFTW037483@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 95762 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: Fri, 21 Apr 2006 06:58:16 -0000

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

Change 95762 by jb@jb_freebsd2 on 2006/04/21 06:57:52

	Change the DTRACE option to KDTRACE because DTRACE conflicted
	with the DTRACE device.
	
	The KDTRACE option means: "build DTrace support into the kernel".
	Specifying this option builds in code covered by CDDL and if the
	binary is distributed, changes to the CDDL files must be 
	distributed too. It is this restriction/limitation which means
	that the DTrace support *must* be an option.
	
	The dtrace device can be built into the kernel or loaded as a
	module. It can only be loaded if the kernel was built with the
	KDTRACE option.

Affected files ...

.. //depot/projects/dtrace/src/sys/conf/options#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/conf/options#4 (text+ko) ====

@@ -599,7 +599,7 @@
 PCFCLOCK_VERBOSE	opt_pcfclock.h
 PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
 
-DTRACE			opt_dtrace.h
+KDTRACE			opt_kdtrace.h
 KTR			opt_global.h
 KTR_ALQ			opt_ktr.h
 KTR_MASK		opt_ktr.h