summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/conf
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-06-18 01:11:04 +0000
committerobrien <obrien@FreeBSD.org>2002-06-18 01:11:04 +0000
commita1cfbf791e284c29fff6b34c8388f668ab8920ca (patch)
tree86ff8b7bb1b20388a100085f1bacd547eac98745 /sys/sparc64/conf
parent8a805cf640b38d8ddeef5ae88ffa448b1bed89e9 (diff)
downloadFreeBSD-src-a1cfbf791e284c29fff6b34c8388f668ab8920ca.zip
FreeBSD-src-a1cfbf791e284c29fff6b34c8388f668ab8920ca.tar.gz
Sync with i386.
Diffstat (limited to 'sys/sparc64/conf')
-rw-r--r--sys/sparc64/conf/GENERIC18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 244a77c..6528122 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -48,7 +48,7 @@ options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-#options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) syscall trace support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
@@ -58,16 +58,17 @@ options SYSVSEM #SYSV-style semaphores
# Debugging for use in -current
options DDB #Enable the kernel debugger
-options BREAK_TO_DEBUGGER #a BREAK on a comconsole drops to DDB
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-#options WITNESS #Enable checks to detect deadlocks and cycles
+options WITNESS #Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options ALT_BREAK_TO_DEBUGGER
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel
# Standard busses
-device apb # Sun APB PCI-PCI bridge
+device apb # Sun APB PCI-PCI bridge
device ebus
device isa
device pci
@@ -78,10 +79,11 @@ device sbus
# ATA and ATAPI devices
device ata
-device atadisk # ATA disk drives
-device atapicd # ATAPI CDROM drives
-#device atapifd # ATAPI floppy drives
-#device atapist # ATAPI tape drives
+device atadisk # ATA disk drives
+device atapicd # ATAPI CDROM drives
+#device atapifd # ATAPI floppy drives
+#device atapist # ATAPI tape drives
+options ATA_STATIC_ID #Static device numbering
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
OpenPOWER on IntegriCloud