Linux-libre 4.8.3-gnupck-4.8.3-gnu

1 files changed, 17 insertions, 32 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 7a4964843..31dbc2b01 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -28,6 +28,14 @@ config BUILDTIME_EXTABLE_SORT
 
 menu "General setup"
 
+config SCHED_MUQSS
+	bool "MuQSS cpu scheduler"
+	default n
+	---help---
+	  The Multiple Queue Skiplist Scheduler for excellent interactivity and
+	  responsiveness on the desktop and highly scalable deterministic
+	  low latency on any hardware.
+
 config PCK_INTERACTIVE
 	bool "Tune kernel for interactivity"
 	default y
@@ -52,7 +60,7 @@ config PCK_INTERACTIVE
 	    CPU migration cost.............:   0.5  ->   0.25 ms
 	    Bandwidth slice size...........:   5    ->   3    ms
 
-	  --- CPU Scheduler (BFS) --------------------------------
+	  --- CPU Scheduler (MuQSS) ------------------------------
 
 	    Scheduling interval............:   6    ->   3    ms
 	    ISO task max realtime use......:  70 %  ->  25 %
@@ -61,29 +69,6 @@ config PCK_INTERACTIVE
 
 	    Ondemand down scaling factor...:   1    ->  10
 
-config SCHED_BFS
-	bool "BFS cpu scheduler"
-	default n
-	help
-	  The Brain Fuck CPU Scheduler for excellent interactivity and
-	  responsiveness on the desktop and solid scalability on normal
-          hardware and commodity servers. Not recommended for 4096 CPUs.
-
-	  Currently incompatible with the Group CPU scheduler, and RCU TORTURE
-          TEST so these options are disabled.
-
-config SCHED_BFS_AUTOISO
-	bool "Automatically use SCHED_ISO policy for X"
-	depends on SCHED_BFS
-	default n
-	help
-	  Selecting this option will automatically use the SCHED_ISO scheduling
-	  policy for X, resulting in an interactivity boost. This *may* cause
-	  things like skipping sound on audio applications that are not run
-	  as SCHED_ISO.
-
-	  Tasks (including X) can be run as sched_iso manually using schedtool.
-
 config BROKEN
 	bool
 
@@ -394,7 +379,7 @@ choice
 # Kind of a stub config for the pure tick based cputime accounting
 config TICK_CPU_ACCOUNTING
 	bool "Simple tick based cputime accounting"
-	depends on !S390 && !NO_HZ_FULL && !SCHED_BFS
+	depends on !S390 && !NO_HZ_FULL && !SCHED_MUQSS
 	help
 	  This is the basic tick based cputime accounting that maintains
 	  statistics about user, system and idle time spent on per jiffies
@@ -419,7 +404,7 @@ config VIRT_CPU_ACCOUNTING_GEN
 	bool "Full dynticks CPU time accounting"
 	depends on HAVE_CONTEXT_TRACKING
 	depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
-	depends on !SCHED_BFS
+	depends on !SCHED_MUQSS
 	select VIRT_CPU_ACCOUNTING
 	select CONTEXT_TRACKING
 	help
@@ -755,7 +740,7 @@ config RCU_NOCB_CPU
 	bool "Offload RCU callback processing from boot-selected CPUs"
 	depends on TREE_RCU || PREEMPT_RCU
 	depends on RCU_EXPERT || NO_HZ_FULL
-	depends on !SCHED_BFS
+	depends on !SCHED_MUQSS
 	default n
 	help
 	  Use this option to reduce OS jitter for aggressive HPC or
@@ -988,7 +973,7 @@ config NUMA_BALANCING
 	depends on ARCH_SUPPORTS_NUMA_BALANCING
 	depends on !ARCH_WANT_NUMA_VARIABLE_LOCALITY
 	depends on SMP && NUMA && MIGRATION
-	depends on !SCHED_BFS
+	depends on !SCHED_MUQSS
 	help
 	  This option adds support for automatic NUMA aware memory/task placement.
 	  The mechanism is quite primitive and is based on migrating memory when
@@ -1091,13 +1076,13 @@ menuconfig CGROUP_SCHED
 	help
 	  This feature lets CPU scheduler recognize task groups and control CPU
 	  bandwidth allocation to such task groups. It uses cgroups to group
-	  tasks. In combination with BFS this is purely a STUB to create the
+	  tasks. In combination with MuQSS this is purely a STUB to create the
 	  files associated with the CPU controller cgroup but most of the
 	  controls do nothing. This is useful for working in environments and
 	  with applications that will only work if this control group is
 	  present.
 
-if CGROUP_SCHED && !SCHED_BFS
+if CGROUP_SCHED && !SCHED_MUQSS
 config FAIR_GROUP_SCHED
 	bool "Group scheduling for SCHED_OTHER"
 	depends on CGROUP_SCHED
@@ -1193,7 +1178,7 @@ config CGROUP_DEVICE
 
 config CGROUP_CPUACCT
 	bool "Simple CPU accounting controller"
-	depends on !SCHED_BFS
+	depends on !SCHED_MUQSS
 	help
 	  Provides a simple controller for monitoring the
 	  total CPU consumed by the tasks in a cgroup.
@@ -1292,7 +1277,7 @@ endif # NAMESPACES
 
 config SCHED_AUTOGROUP
 	bool "Automatic process group scheduling"
-	depends on !SCHED_BFS
+	depends on !SCHED_MUQSS
 	select CGROUPS
 	select CGROUP_SCHED
 	select FAIR_GROUP_SCHED