2 files changed, 68 insertions, 66 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d95ca7cd5d45..089a230e5652 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -396,6 +396,22 @@ config RCU_FANOUT_EXACT
 
           Say N if unsure.
 
+config RCU_FAST_NO_HZ
+        bool "Accelerate last non-dyntick-idle CPU's grace periods"
+        depends on TREE_RCU && NO_HZ && SMP
+        default n
+        help
+          This option causes RCU to attempt to accelerate grace periods
+          in order to allow the final CPU to enter dynticks-idle state
+          more quickly.  On the other hand, this option increases the
+          overhead of the dynticks-idle checking, particularly on systems
+          with large numbers of CPUs.
+
+          Say Y if energy efficiency is critically important, particularly
+                if you have relatively few CPUs.
+
+          Say N if you are unsure.
+
 config TREE_RCU_TRACE
         def_bool RCU_TRACE && ( TREE_RCU || TREE_PREEMPT_RCU )
         select DEBUG_FS
@@ -445,57 +461,6 @@ config LOG_BUF_SHIFT
 config HAVE_UNSTABLE_SCHED_CLOCK
         bool
 
-config GROUP_SCHED
-        bool "Group CPU scheduler"
-        depends on EXPERIMENTAL
-        default n
-        help
-          This feature lets CPU scheduler recognize task groups and control CPU
-          bandwidth allocation to such task groups.
-          In order to create a group from arbitrary set of processes, use
-          CONFIG_CGROUPS. (See Control Group support.)
-
-config FAIR_GROUP_SCHED
-        bool "Group scheduling for SCHED_OTHER"
-        depends on GROUP_SCHED
-        default GROUP_SCHED
-
-config RT_GROUP_SCHED
-        bool "Group scheduling for SCHED_RR/FIFO"
-        depends on EXPERIMENTAL
-        depends on GROUP_SCHED
-        default n
-        help
-          This feature lets you explicitly allocate real CPU bandwidth
-          to users or control groups (depending on the "Basis for grouping tasks"
-          setting below. If enabled, it will also make it impossible to
-          schedule realtime tasks for non-root users until you allocate
-          realtime bandwidth for them.
-          See Documentation/scheduler/sched-rt-group.txt for more information.
-
-choice
-        depends on GROUP_SCHED
-        prompt "Basis for grouping tasks"
-        default USER_SCHED
-
-config USER_SCHED
-        bool "user id"
-        help
-          This option will choose userid as the basis for grouping
-          tasks, thus providing equal CPU bandwidth to each user.
-
-config CGROUP_SCHED
-        bool "Control groups"
-        depends on CGROUPS
-        help
-          This option allows you to create arbitrary task groups
-          using the "cgroup" pseudo filesystem and control
-          the cpu bandwidth allocated to each such task group.
-          Refer to Documentation/cgroups/cgroups.txt for more
-          information on "cgroup" pseudo filesystem.
-
-endchoice
-
 menuconfig CGROUPS
         boolean "Control Group support"
         help
@@ -616,6 +581,36 @@ config CGROUP_MEM_RES_CTLR_SWAP
           Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
           size is 4096bytes, 512k per 1Gbytes of swap.
 
+menuconfig CGROUP_SCHED
+        bool "Group CPU scheduler"
+        depends on EXPERIMENTAL && CGROUPS
+        default n
+        help
+          This feature lets CPU scheduler recognize task groups and control CPU
+          bandwidth allocation to such task groups. It uses cgroups to group
+          tasks.
+
+if CGROUP_SCHED
+config FAIR_GROUP_SCHED
+        bool "Group scheduling for SCHED_OTHER"
+        depends on CGROUP_SCHED
+        default CGROUP_SCHED
+
+config RT_GROUP_SCHED
+        bool "Group scheduling for SCHED_RR/FIFO"
+        depends on EXPERIMENTAL
+        depends on CGROUP_SCHED
+        default n
+        help
+          This feature lets you explicitly allocate real CPU bandwidth
+          to users or control groups (depending on the "Basis for grouping tasks"
+          setting below. If enabled, it will also make it impossible to
+          schedule realtime tasks for non-root users until you allocate
+          realtime bandwidth for them.
+          See Documentation/scheduler/sched-rt-group.txt for more information.
+
+endif #CGROUP_SCHED
+
 endif # CGROUPS
 
 config MM_OWNER
@@ -976,19 +971,6 @@ config PERF_EVENTS
 
           Say Y if unsure.
 
-config EVENT_PROFILE
-        bool "Tracepoint profiling sources"
-        depends on PERF_EVENTS && EVENT_TRACING
-        default y
-        help
-         Allow the use of tracepoints as software performance events.
-
-         When this is enabled, you can create perf events based on
-         tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
-         found in debugfs://tracing/events/*/*/id. (The -e/--events
-         option to the perf tool can parse and interpret symbolic
-         tracepoints, in the subsystem:tracepoint_name format.)
-
 config PERF_COUNTERS
         bool "Kernel performance counters (old config option)"
         depends on HAVE_PERF_EVENTS
@@ -1112,7 +1094,7 @@ config MMAP_ALLOW_UNINITIALIZED
           See Documentation/nommu-mmap.txt for more information.
 
 config PROFILING
-        bool "Profiling support (EXPERIMENTAL)"
+        bool "Profiling support"
         help
           Say Y here to enable the extended profiling support mechanisms used
           by profilers such as OProfile.
@@ -1262,4 +1244,8 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
         bool
 
+config PADATA
+        depends on SMP
+        bool
+
 source "kernel/Kconfig.locks"
diff --git a/init/main.c b/init/main.c
index 106e02d7ffa5..40aaa020cd68 100644
--- a/init/main.c
+++ b/init/main.c
@@ -149,6 +149,20 @@ static int __init nosmp(char *str)
 
 early_param("nosmp", nosmp);
 
+/* this is hard limit */
+static int __init nrcpus(char *str)
+{
+        int nr_cpus;
+
+        get_option(&str, &nr_cpus);
+        if (nr_cpus > 0 && nr_cpus < nr_cpu_ids)
+                nr_cpu_ids = nr_cpus;
+
+        return 0;
+}
+
+early_param("nr_cpus", nrcpus);
+
 static int __init maxcpus(char *str)
 {
         get_option(&str, &setup_max_cpus);
@@ -416,7 +430,9 @@ static noinline void __init_refok rest_init(void)
         kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
         pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES);
+        rcu_read_lock();
         kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns);
+        rcu_read_unlock();
         unlock_kernel();
 
         /*
@@ -584,6 +600,7 @@ asmlinkage void __init start_kernel(void)
                 local_irq_disable();
         }
         rcu_init();
+        radix_tree_init();
         /* init some links before init_ISA_irqs() */
         early_irq_init();
         init_IRQ();
@@ -657,7 +674,6 @@ asmlinkage void __init start_kernel(void)
         proc_caches_init();
         buffer_init();
         key_init();
-        radix_tree_init();
         security_init();
         vfs_caches_init(totalram_pages);
         signals_init();