diff options
author | brooks <brooks@FreeBSD.org> | 2012-04-20 21:37:42 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2012-04-20 21:37:42 +0000 |
commit | bec1819d5da47a13f51e7535a4fd287437078237 (patch) | |
tree | 6a925cf4f81852c24565d155be3c9554f20fdbb1 | |
parent | 84c3149802e4c5f18808ad7e53bac8e9658f8a3a (diff) | |
download | FreeBSD-src-bec1819d5da47a13f51e7535a4fd287437078237.zip FreeBSD-src-bec1819d5da47a13f51e7535a4fd287437078237.tar.gz |
Enable DTrace hooks in GENERIC.
Reviewed by: gnn
Approved by: core (jhb, imp)
Requested by: a cast of thousands
MFC after: 3 days
-rw-r--r-- | sys/amd64/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 97778f1..b9fb513 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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 auditing 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 support. # 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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index a527663..58b66a1 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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 auditing 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 support. # 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 |