summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf/GENERIC
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2013-09-04 20:55:56 +0000
committergrehan <grehan@FreeBSD.org>2013-09-04 20:55:56 +0000
commit9394ef331eb7d0ba7f22583970cc84b62ad9f19a (patch)
tree6040478b6b269a45720445a5b70f1eb459bc57de /sys/amd64/conf/GENERIC
parentfd121a9c7b0c558bd6523654b46615e4cf221074 (diff)
parent237a3159e4926d05737954f8f739b79a3976cdaa (diff)
downloadFreeBSD-src-9394ef331eb7d0ba7f22583970cc84b62ad9f19a.zip
FreeBSD-src-9394ef331eb7d0ba7f22583970cc84b62ad9f19a.tar.gz
IFC @ r255209
Diffstat (limited to 'sys/amd64/conf/GENERIC')
-rw-r--r--sys/amd64/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index f3f6915..3b885c1 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -66,6 +66,7 @@ options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options CAPABILITY_MODE # Capsicum capability mode
options CAPABILITIES # Capsicum capabilities
+options PROCDESC # Support for process descriptors
options MAC # TrustedBSD MAC Framework
options KDTRACE_FRAME # Ensure frames are compiled in
options KDTRACE_HOOKS # Kernel DTrace hooks
@@ -74,9 +75,8 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel
# Debugging support. Always need this:
options KDB # Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options KDB_TRACE # Print a stack trace for a panic.
-# For full debugger support use this instead:
+options KDB_TRACE # Print a stack trace for a panic.
+# For full debugger support use (turn off in stable branch):
options DDB # Support DDB.
options GDB # Support remote GDB.
options DEADLKRES # Enable the deadlock resolver
@@ -293,8 +293,8 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options PADLOCK_RNG # VIA Padlock RNG
-options RDRAND_RNG # Intel Bull Mountain RNG
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
OpenPOWER on IntegriCloud