Author: brooks
Date: Fri Apr 20 21:37:42 2012
New Revision: 234504
URL: http://svn.freebsd.org/changeset/base/234504

Log:
  Enable DTrace hooks in GENERIC.
  
  Reviewed by:  gnn
  Approved by:  core (jhb, imp)
  Requested by: a cast of thousands
  MFC after:    3 days

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Fri Apr 20 21:17:33 2012        (r234503)
+++ head/sys/amd64/conf/GENERIC Fri Apr 20 21:37:42 2012        (r234504)
@@ -22,6 +22,7 @@ cpu           HAMMER
 ident          GENERIC
 
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
+makeoptions    WITH_CTF=1              # Run ctfconvert(1) for DTrace support
 
 options        SCHED_ULE               # ULE scheduler
 options        PREEMPTION              # Enable kernel thread preemption
@@ -63,8 +64,8 @@ options       AUDIT                   # Security event auditi
 options        CAPABILITY_MODE         # Capsicum capability mode
 options        CAPABILITIES            # Capsicum capabilities
 options        MAC                     # TrustedBSD MAC Framework
-#options       KDTRACE_FRAME           # Ensure frames are compiled in
-#options       KDTRACE_HOOKS           # Kernel DTrace hooks
+options        KDTRACE_FRAME           # Ensure frames are compiled in
+options        KDTRACE_HOOKS           # Kernel DTrace hooks
 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Debugging support.  Always need this:
@@ -74,6 +75,7 @@ options       KDB                     # Enable kernel 
debugger 
 # For full debugger support use this instead:
 options        DDB                     # Support DDB.
 options        GDB                     # Support remote GDB.
+options        DDB_CTF                 # kernel ELF linker loads CTF data
 options        DEADLKRES               # Enable the deadlock resolver
 options        INVARIANTS              # Enable calls of extra sanity checking
 options        INVARIANT_SUPPORT       # Extra sanity checks of internal 
structures, required by INVARIANTS

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Fri Apr 20 21:17:33 2012        (r234503)
+++ head/sys/i386/conf/GENERIC  Fri Apr 20 21:37:42 2012        (r234504)
@@ -24,6 +24,7 @@ cpu           I686_CPU
 ident          GENERIC
 
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
+makeoptions    WITH_CTF=1              # Run ctfconvert(1) for DTrace support
 
 options        SCHED_ULE               # ULE scheduler
 options        PREEMPTION              # Enable kernel thread preemption
@@ -64,7 +65,7 @@ options       AUDIT                   # Security event auditi
 options        CAPABILITY_MODE         # Capsicum capability mode
 options        CAPABILITIES            # Capsicum capabilities
 options        MAC                     # TrustedBSD MAC Framework
-#options       KDTRACE_HOOKS           # Kernel DTrace hooks
+options        KDTRACE_HOOKS           # Kernel DTrace hooks
 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Debugging support.  Always need this:
@@ -74,6 +75,7 @@ options       KDB                     # Enable kernel 
debugger 
 # For full debugger support use this instead:
 options        DDB                     # Support DDB.
 options        GDB                     # Support remote GDB.
+options        DDB_CTF                 # kernel ELF linker loads CTF data
 options        DEADLKRES               # Enable the deadlock resolver
 options        INVARIANTS              # Enable calls of extra sanity checking
 options        INVARIANT_SUPPORT       # Extra sanity checks of internal 
structures, required by INVARIANTS
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to