From 8391a99bf7b41b22bd22386eaeeaecceff4cd465 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Sat, 4 Nov 2006 23:50:12 +0000
Subject: [PATCH] Remove the KDTRACE option again because of the complaints
 about having it as a default.

For the record, the KDTRACE option caused _no_ additional source files
to be compiled in; certainly no CDDL source files. All it did was to
allow existing BSD licensed kernel files to include one or more CDDL
header files.

By removing this from DEFAULTS, the onus is on a kernel builder to add
the option to the kernel config, possibly by including GENERIC and
customising from there. It means that DTrace won't be a feature
available in FreeBSD by default, which is the way I intended it to be.

Without this option, you can't load the dtrace module (which contains
the dtrace device and the DTrace framework). This is equivalent to
requiring an option in a kernel config before you can load the linux
emulation module, for example.

I think it is a mistake to have DTrace ported to FreeBSD, but not
to have it available to everyone, all the time. The only exception
to this is the companies which distribute systems with FreeBSD embedded.
Those companies will customise their systems anyway. The KDTRACE
option was intended for them, and only them.
---
 sys/amd64/conf/DEFAULTS   | 3 ---
 sys/i386/conf/DEFAULTS    | 3 ---
 sys/ia64/conf/DEFAULTS    | 3 ---
 sys/pc98/conf/DEFAULTS    | 3 ---
 sys/powerpc/conf/DEFAULTS | 3 ---
 sys/sparc64/conf/DEFAULTS | 3 ---
 sys/sun4v/conf/DEFAULTS   | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 64498c73f67..4cf775f2d62 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -17,6 +17,3 @@ device		uart_ns8250
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 17174b4b9f3..50a30ee7d59 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -21,6 +21,3 @@ device		uart_ns8250
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index a66c5969fca..c36a9674e41 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -20,6 +20,3 @@ options 	GEOM_MBR
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index 6b480b71ace..7fd3dbaecd6 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -23,6 +23,3 @@ device		uart_ns8250
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 833b14d5770..c25145a75b0 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -14,6 +14,3 @@ device		uart_z8530
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index f1cfbd7f97b..8545b37e4cb 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -15,6 +15,3 @@ device		uart_z8530
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE
diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS
index 4efe701131d..a4bea1ad1d8 100644
--- a/sys/sun4v/conf/DEFAULTS
+++ b/sys/sun4v/conf/DEFAULTS
@@ -7,6 +7,3 @@ machine		sun4v
 
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
-
-# Kernel support for loading DTrace modules
-options 	KDTRACE