summaryrefslogtreecommitdiffstats
path: root/sys/ia64/conf
diff options
context:
space:
mode:
authorkensmith <kensmith@FreeBSD.org>2011-10-26 22:28:28 +0000
committerkensmith <kensmith@FreeBSD.org>2011-10-26 22:28:28 +0000
commita971a18dec06db4168da396d47bb5e16b269f2a5 (patch)
tree040ce412c65faadea0a2b0e15fb624142ccbc179 /sys/ia64/conf
parenta4f906fd74b17750c944eb3293e7c0fcf5698f46 (diff)
downloadFreeBSD-src-a971a18dec06db4168da396d47bb5e16b269f2a5.zip
FreeBSD-src-a971a18dec06db4168da396d47bb5e16b269f2a5.tar.gz
Move the debugging support to its own section. This matches what is
in the other architectures' GENERIC and makes removing it at the point we're creating a new stable branch a bit easier. Discussed with: marcel
Diffstat (limited to 'sys/ia64/conf')
-rw-r--r--sys/ia64/conf/GENERIC16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 97d8813..a9dd567 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -28,17 +28,11 @@ makeoptions DEBUG=-g # Build kernel with debug information.
options AUDIT # Security event auditing
options CD9660 # ISO 9660 Filesystem
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options DDB # Support DDB
-options DEADLKRES # Enable the deadlock resolver
options FFS # Berkeley Fast Filesystem
-options GDB # Support remote GDB
options GEOM_LABEL # Provides labelization
options INCLUDE_CONFIG_FILE # Include this file in kernel
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-options INVARIANTS # Enable calls of extra sanity checking
-options INVARIANT_SUPPORT # required by INVARIANTS
-options KDB # Enable kernel debugger support
options KTRACE # ktrace(1) syscall trace support
options MAC # TrustedBSD MAC Framework
options MD_ROOT # MD usable as root device
@@ -64,9 +58,17 @@ options SYSVSHM # SYSV-style shared memory
options UFS_ACL # Support for access control lists
options UFS_DIRHASH # Hash-based directory lookup scheme
options UFS_GJOURNAL # Enable gjournal-based UFS journaling
+options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions
+
+# Debugging for use in -current
+options KDB # Enable kernel debugger support
+options DDB # Support DDB
+options GDB # Support remote GDB
+options DEADLKRES # Enable the deadlock resolver
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # required by INVARIANTS
options WITNESS # Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
# Various "busses"
OpenPOWER on IntegriCloud