Linux-libre 4.4.1-gnupck-4.4.1-gnu

2 files changed, 31 insertions, 43 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 65c521f05..f7e8c274a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -28,29 +28,6 @@ config BUILDTIME_EXTABLE_SORT
 
 menu "General setup"
 
-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 PCK_INTERACTIVE
 	bool "Tune kernel for interactivity"
 	default y
@@ -61,17 +38,13 @@ config PCK_INTERACTIVE
 	    Mem dirty before bg writeback..:  10 %  -> 128 MiB
 	    Mem dirty before sync writeback:  20 %  -> 256 MiB
 
-	  --- CPU Scheduler (CFS) ---
+	  --- CPU Scheduler ---
 	    Scheduling latency.............:   6    ->   3    ms
 	    Minimal granularity............:   0.75 ->   0.3  ms
 	    Wakeup granularity.............:   1    ->   0.5  ms
 	    CPU migration cost.............:   0.5  ->   0.25 ms
 	    Bandwidth slice size...........:   5    ->   3    ms
 
-	  --- CPU Scheduler (BFS) ---
-	    Scheduling interval............:   6    ->   3    ms
-	    ISO task max realtime use......:  70 %  ->  25 %
-
 	  --- CPU Frequency Scaling ---
 	    Ondemand down scaling factor...:   1    ->  10
 
@@ -400,7 +373,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
 	help
 	  This is the basic tick based cputime accounting that maintains
 	  statistics about user, system and idle time spent on per jiffies
@@ -425,7 +398,6 @@ 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
 	select VIRT_CPU_ACCOUNTING
 	select CONTEXT_TRACKING
 	help
@@ -760,7 +732,6 @@ 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
 	default n
 	help
 	  Use this option to reduce OS jitter for aggressive HPC or
@@ -971,7 +942,6 @@ 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
 	help
 	  This option adds support for automatic NUMA aware memory/task placement.
 	  The mechanism is quite primitive and is based on migrating memory when
@@ -1058,7 +1028,6 @@ config PROC_PID_CPUSET
 
 config CGROUP_CPUACCT
 	bool "Simple CPU accounting cgroup subsystem"
-	depends on !SCHED_BFS
 	help
 	  Provides a simple Resource Controller for monitoring the
 	  total CPU consumed by the tasks in a cgroup.
@@ -1144,7 +1113,6 @@ config CGROUP_PERF
 
 menuconfig CGROUP_SCHED
 	bool "Group CPU scheduler"
-	depends on !SCHED_BFS
 	default n
 	help
 	  This feature lets CPU scheduler recognize task groups and control CPU
@@ -1219,7 +1187,7 @@ config CGROUP_WRITEBACK
 endif # CGROUPS
 
 config CHECKPOINT_RESTORE
-	bool "Checkpoint/restore support"
+	bool "Checkpoint/restore support" if EXPERT
 	select PROC_CHILDREN
 	default n
 	help
@@ -1292,7 +1260,6 @@ endif # NAMESPACES
 
 config SCHED_AUTOGROUP
 	bool "Automatic process group scheduling"
-	depends on !SCHED_BFS
 	select CGROUPS
 	select CGROUP_SCHED
 	select FAIR_GROUP_SCHED
@@ -1374,13 +1341,36 @@ source "usr/Kconfig"
 
 endif
 
+choice
+	prompt "Code optimization level"
+	default CC_OPTIMIZE_DEFAULT
+	help
+	  Select the optimization flag to pass to the compiler,
+	  affecting kernel size, speed and compilation time.
+
+	  If in doubt, choose the default optimization level.
+
+config CC_OPTIMIZE_DEFAULT
+	bool "Default optimization"
+	help
+	  This option will pass "-O2" to your compiler. This is
+	  the recommended level and the most tested.
+
+config CC_OPTIMIZE_HARDER
+	bool "Optimize harder"
+	help
+	  This option will pass "-O3" to your compiler resulting
+	  in a larger and faster kernel. The more complex
+	  optimizations also increase compilation time and may
+	  affect stability.
+
 config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
 	help
-	  Enabling this option will pass "-Os" instead of "-O2" to
-	  your compiler resulting in a smaller kernel.
+	  This option will pass "-Os" to your compiler resulting
+	  in a smaller kernel.
 
-	  If unsure, say N.
+endchoice
 
 config SYSCTL
 	bool
@@ -1784,7 +1774,6 @@ choice
 	   This option allows to select a slab allocator.
 
 config SLAB
-	depends on !SCHED_BFS
 	bool "SLAB"
 	help
 	  The regular slab allocator that is established and known to work
@@ -1802,7 +1791,7 @@ config SLUB
 	   a slab allocator.
 
 config SLOB
-	depends on EXPERT && !SCHED_BFS
+	depends on EXPERT
 	bool "SLOB (Simple Allocator)"
 	help
 	   SLOB replaces the stock allocator with a drastically simpler
diff --git a/init/main.c b/init/main.c
index 7e98e9b86..9e64d7097 100644
--- a/init/main.c
+++ b/init/main.c
@@ -808,6 +808,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
 	return ret;
 }
 
+
 extern initcall_t __initcall_start[];
 extern initcall_t __initcall0_start[];
 extern initcall_t __initcall1_start[];
@@ -942,8 +943,6 @@ static int __ref kernel_init(void *unused)
 
 	flush_delayed_fput();
 
-	print_scheduler_version();
-
 	if (ramdisk_execute_command) {
 		ret = run_init_process(ramdisk_execute_command);
 		if (!ret)