- Remove SCHED_ULE from GENERIC to better avoid foot-shooting by

  unsuspecting users.
- Add a comment in NOTES about experimental status of SCHED_ULE.
- Make warning about experimental status in sched_ule(4) a bit
  stronger.

Suggested and reviewed by:	dougb
Discussed on:			developers
MFC after:			3 days

9 files changed, 3 insertions, 9 deletions

diff --git a/share/man/man4/sched_ule.4 b/share/man/man4/sched_ule.4
index 7ff8232..ec571cc 100644
--- a/share/man/man4/sched_ule.4
+++ b/share/man/man4/sched_ule.4
@@ -87,4 +87,4 @@ is not enabled by default due to a number of known issues, including weak
 performance with several known workloads, and reports of instability.
 Deployment of
 .Nm
-in production environments should be done cautiously.
+in production environments is not recommended at this time.
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3cd1c23..d4b38d4 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -26,7 +26,6 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
-#options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 6fc0516..5143ba2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -163,7 +163,8 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 #
 # SCHED_ULE is a new scheduler that has been designed for SMP and has some
 # advantages for UP as well.  It is intended to replace the 4BSD scheduler
-# over time.
+# over time.  NOTE: SCHED_ULE is currently considered experimental and is
+# not recommended for production use at this time.
 #
 options 	SCHED_4BSD
 #options 	SCHED_CORE
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 05da07a..0e0a91f 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -28,7 +28,6 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
-#options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index db95818..6851996 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -44,7 +44,6 @@ options 	NFS_ROOT	# NFS usable as root device
 options 	PROCFS		# Process filesystem (/proc)
 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 	SMP		# Symmetric Multi-Processor support
 options 	SOFTUPDATES	# Enable FFS soft updates support
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 9263803..233a1af 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -28,7 +28,6 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
-#options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index aefcc81..716e173 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -30,7 +30,6 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options 	POWERMAC		#NewWorld Apple PowerMacs
 options 	PSIM			#GDB PSIM ppc simulator
 
-#options 	SCHED_ULE		#ULE scheduler
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 82da5cd..20c6943 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -31,7 +31,6 @@ makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 # Platforms supported
 #	At this time all platforms are supported, as-is.
 
-#options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index e5421c6..0acbaab 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -29,7 +29,6 @@ makeoptions	NO_MODULES=""		# disable modules (aicasm in buildenv)
 # Platforms supported
 #	At this time all platforms are supported, as-is.
 
-#options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking