diff options
Diffstat (limited to 'sys/alpha/conf/GENERIC')
| -rw-r--r-- | sys/alpha/conf/GENERIC | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index d479772..2d4edad 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -45,7 +45,7 @@ options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser) options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) -options SCHED_4BSD #4BSD scheduler +options SCHED_ULE #ULE scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem @@ -60,7 +60,6 @@ options MSDOSFS #MSDOS Filesystem 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 COMPAT_FREEBSD4 #Compatible with FreeBSD4 options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support @@ -74,8 +73,13 @@ options PFIL_HOOKS # pfil(9) framework options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +<<<<<<< GENERIC +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN +======= #options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +>>>>>>> 1.165 # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel |
