=====================================================================
Add the DTrace kernel hooks to the GENERIC kernel.
---------------------------------------------------------------------
--- /u/freebsd/head/src/sys/amd64/conf/GENERIC	2008-05-21 07:25:46.000000000 +1000
+++ /u/p4/dtrace/src/sys/amd64/conf/GENERIC	2008-05-21 07:27:16.000000000 +1000
@@ -64,10 +64,14 @@
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options 	AUDIT			# Security event auditing
+options 	PRINTF_BUFR_SIZE=128    # Prevent printf output being interspersed.
+options 	KDTRACE_FRAME		# Ensure frames are compiled in
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 
 # Debugging for use in -current
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
+options 	DDB_CTF			# Load CTF data too.
 options 	GDB			# Support remote GDB.
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS