summaryrefslogtreecommitdiffstats
path: root/sys/ia64/conf
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2008-02-16 18:30:58 +0000
committermarcel <marcel@FreeBSD.org>2008-02-16 18:30:58 +0000
commitf051ca1feb52908fddd292d0f94338e5c33ddda3 (patch)
tree876b7ab63af06d81c6dd3b73d3cad54452ca958a /sys/ia64/conf
parentb871fc793c9fdaeaed33c95e35535e96d5dbd251 (diff)
downloadFreeBSD-src-f051ca1feb52908fddd292d0f94338e5c33ddda3.zip
FreeBSD-src-f051ca1feb52908fddd292d0f94338e5c33ddda3.tar.gz
Re-sort options. While here:
o remove COMPAT_FREEBSD5 o add INVARIANTS o add WITNESS
Diffstat (limited to 'sys/ia64/conf')
-rw-r--r--sys/ia64/conf/GENERIC13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 6287abc..9d1c47c 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -25,17 +25,19 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with debug information.
+options AUDIT # Security event auditing
options CD9660 # ISO 9660 Filesystem
options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
-options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options DDB # Support DDB
options FFS # Berkeley Fast Filesystem
options GDB # Support remote GDB
+options GEOM_LABEL # Provides labelization
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-options SCTP # Stream Control Transmission Protocol
+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 MD_ROOT # MD usable as root device
@@ -45,20 +47,21 @@ options NFSSERVER # Network Filesystem Server
options NFS_ROOT # NFS usable as root device
options PROCFS # Process filesystem (/proc)
options PSEUDOFS # Pseudo-filesystem framework
-options GEOM_LABEL # Provides labelization
options SCHED_4BSD # 4BSD scheduler
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options SCTP # Stream Control Transmission Protocol
options SMP # Symmetric Multi-Processor support
options SOFTUPDATES # Enable FFS soft updates support
-options UFS_GJOURNAL # Enable gjournal-based UFS journaling
options STACK # stack(9) support
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
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 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 AUDIT # Security event auditing
# Various "busses"
device firewire # FireWire bus code
OpenPOWER on IntegriCloud