d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Recruit some new ULE users by making it the default scheduler in GENERIC.

Browse Source 
ULE will be in a probationary period to determine whether it will be left
   as the default in 5.3 which would likely mean the rest of the 5.x series.
This commit is contained in:
Jeff Roberson 2004-01-24 21:38:52 +00:00
parent 8a0402a4b8
commit 048ac395be
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/alpha/conf/GENERIC
View File

@ -45,7 +45,7 @@ options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide), options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup) # AlphaServer 1200 (Tincup)
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem
@ -60,7 +60,6 @@ options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS) options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4 options COMPAT_FREEBSD4 #Compatible with FreeBSD4
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 KTRACE #ktrace(1) syscall trace support
@ -74,8 +73,13 @@ options PFIL_HOOKS # pfil(9) framework
options DDB #Enable the kernel debugger options DDB #Enable the kernel debugger
options INVARIANTS #Enable calls of extra sanity checking options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS 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 #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
>>>>>>> 1.165
# To make an SMP kernel, the next line is needed # To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel options SMP # Symmetric MultiProcessor Kernel

2
sys/amd64/conf/GENERIC
View File

@ -28,7 +28,7 @@ ident GENERIC
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions NO_MODULES=not_yet makeoptions NO_MODULES=not_yet
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem

2
sys/i386/conf/GENERIC
View File

@ -29,7 +29,7 @@ ident GENERIC
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem

2
sys/ia64/conf/GENERIC
View File

@ -40,7 +40,7 @@ options NFSSERVER # Network Filesystem Server
options NFS_ROOT # NFS usable as root device options NFS_ROOT # NFS usable as root device
options PROCFS # Process filesystem (/proc) options PROCFS # Process filesystem (/proc)
options PSEUDOFS # Pseudo-filesystem framework options PSEUDOFS # Pseudo-filesystem framework
options SCHED_4BSD # 4BSD scheduler options SCHED_ULE # ULE scheduler
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
#options SMP # SMP support #options SMP # SMP support
options SOFTUPDATES # Enable FFS soft updates support options SOFTUPDATES # Enable FFS soft updates support

2
sys/pc98/conf/GENERIC
View File

@ -31,7 +31,7 @@ ident GENERIC
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options PC98 #PC98 options PC98 #PC98
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem

2
sys/powerpc/conf/GENERIC
View File

@ -32,7 +32,7 @@ makeoptions WERROR=-Wno-error #XXX: We don't want -Werror just now
options POWERMAC #NewWorld Apple PowerMacs options POWERMAC #NewWorld Apple PowerMacs
options PSIM #GDB PSIM ppc simulator options PSIM #GDB PSIM ppc simulator
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem

2
sys/sparc64/conf/GENERIC
View File

@ -32,7 +32,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# Platforms supported # Platforms supported
# At this time all platforms are supported, as-is. # At this time all platforms are supported, as-is.
options SCHED_4BSD #4BSD scheduler options SCHED_ULE #ULE scheduler
options INET #InterNETworking options INET #InterNETworking
options INET6 #IPv6 communications protocols options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem options FFS #Berkeley Fast Filesystem