- Introduce the SCHED_ULE and SCHED_4BSD options for compile time selection

   of the scheduler.
 - Add SCHED_4BSD as the scheduler for all kernel config files in cvs.

12 files changed, 17 insertions, 1 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index ad1e8b7..8f99c4e 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -46,6 +46,7 @@ options 	DEC_KN8AE		# AlphaServer 8200/8400 (Turbolaser)
 options 	DEC_KN300		# AlphaServer 4100 (Rawhide),
 					# AlphaServer 1200 (Tincup)
 
+options		SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index ff95cf1..982f292 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -20,6 +20,8 @@ maxusers	10
 
 options 	DEC_KN8AE
 options 	SIMOS
+
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCLIENT		#Network Filesystem Client
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4de88ce..52f2119 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -30,6 +30,7 @@ maxusers	0
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
@@ -64,6 +65,7 @@ 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_SKIPSPIN	#Don't run witness on spinlocks for speed
+options		SCHED_4BSD
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
diff --git a/sys/conf/files b/sys/conf/files
index 8169723..9f3dabf 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1025,7 +1025,8 @@ kern/kern_xxx.c		standard
 kern/link_elf.c		standard
 kern/md4c.c		optional netsmb
 kern/md5c.c		standard
-kern/sched_4bsd.c	standard
+kern/sched_4bsd.c	optional sched_4bsd
+kern/sched_ule.c	optional sched_ule
 kern/subr_autoconf.c	standard
 kern/subr_blist.c	standard
 kern/subr_bus.c		standard
diff --git a/sys/conf/options b/sys/conf/options
index 182a241..50df8f7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -112,6 +112,8 @@ PANIC_REBOOT_WAIT_TIME	opt_panic.h
 PPS_SYNC	opt_ntp.h
 PUC_FASTINTR	opt_puc.h
 QUOTA
+SCHED_4BSD	opt_sched.h
+SCHED_ULE	opt_sched.h
 SHOW_BUSYBUFS
 SPX_HACK
 SUIDDIR		opt_suiddir.h
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 4de88ce..52f2119 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -30,6 +30,7 @@ maxusers	0
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
@@ -64,6 +65,7 @@ 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_SKIPSPIN	#Don't run witness on spinlocks for speed
+options		SCHED_4BSD
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
diff --git a/sys/i386/conf/OLDCARD b/sys/i386/conf/OLDCARD
index aad7fe0..6117ea5 100644
--- a/sys/i386/conf/OLDCARD
+++ b/sys/i386/conf/OLDCARD
@@ -31,6 +31,7 @@ maxusers	0
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 9d124db..dc96c10 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -30,6 +30,7 @@ maxusers	0
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 5421438..1b8f179 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -34,6 +34,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	NO_CPU_COPTFLAGS=true	#Ignore any x86 CPUTYPE
 
 options 	SKI			#Support for HP simulator
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 #options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 5941a95..035a2ce 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -33,6 +33,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	PC98			#PC98
 options 	MATH_EMULATE		#Support for x87 emulation
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 1dc3757..f0cd5bc 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -33,6 +33,7 @@ makeoptions	WERROR=-Wno-error	#XXX: We don't want -Werror just now
 options 	POWERMAC		#NewWorld Apple PowerMacs
 options		PSIM			#GDB PSIM ppc simulator
 
+options         SCHED_4BSD              #4BSD scheduler
 options		INET			#InterNETworking
 options		INET6			#IPv6 communications protocols
 options		FFS			#Berkeley Fast Filesystem
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 9279c8f..6fb5df1 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -33,6 +33,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 # Platforms supported
 #	At this time all platforms are supported, as-is.
 
+options         SCHED_4BSD              #4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem