3 files changed, 28 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index e20aa3112240..d62778390e55 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -673,7 +673,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
           be careful about enabling this. When memory resource controller
           is disabled by boot option, this will be automatically disabled and
           there will be no overhead from this. Even when you set this config=y,
-          if boot option "noswapaccount" is set, swap will not be accounted.
+          if boot option "swapaccount=0" is set, swap will not be accounted.
           Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
           size is 4096bytes, 512k per 1Gbytes of swap.
 config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
@@ -688,7 +688,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
           parameter should have this option unselected.
           For those who want to have the feature enabled by default should
           select this option (if, for some reason, they need to disable it
-          then noswapaccount does the trick).
+          then swapaccount=0 does the trick).
 
 config CGROUP_PERF
         bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
diff --git a/init/calibrate.c b/init/calibrate.c
index aae2f40fea4c..24df7976816c 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/timex.h>
 #include <linux/smp.h>
+#include <linux/percpu.h>
 
 unsigned long lpj_fine;
 unsigned long preset_lpj;
@@ -243,12 +244,19 @@ recalibrate:
         return lpj;
 }
 
+static DEFINE_PER_CPU(unsigned long, cpu_loops_per_jiffy) = { 0 };
+
 void __cpuinit calibrate_delay(void)
 {
         unsigned long lpj;
         static bool printed;
+        int this_cpu = smp_processor_id();
 
-        if (preset_lpj) {
+        if (per_cpu(cpu_loops_per_jiffy, this_cpu)) {
+                lpj = per_cpu(cpu_loops_per_jiffy, this_cpu);
+                pr_info("Calibrating delay loop (skipped) "
+                                "already calibrated this CPU");
+        } else if (preset_lpj) {
                 lpj = preset_lpj;
                 if (!printed)
                         pr_info("Calibrating delay loop (skipped) "
@@ -266,6 +274,7 @@ void __cpuinit calibrate_delay(void)
                         pr_info("Calibrating delay loop... ");
                 lpj = calibrate_delay_converge();
         }
+        per_cpu(cpu_loops_per_jiffy, this_cpu) = lpj;
         if (!printed)
                 pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
                         lpj/(500000/HZ),
diff --git a/init/main.c b/init/main.c
index d7211faed2ad..03b408dff825 100644
--- a/init/main.c
+++ b/init/main.c
@@ -209,8 +209,19 @@ early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
-        get_option(&str, &console_loglevel);
-        return 0;
+        int newlevel;
+
+        /*
+         * Only update loglevel value when a correct setting was passed,
+         * to prevent blind crashes (when loglevel being set to 0) that
+         * are quite hard to debug
+         */
+        if (get_option(&str, &newlevel)) {
+                console_loglevel = newlevel;
+                return 0;
+        }
+
+        return -EINVAL;
 }
 
 early_param("loglevel", loglevel);
@@ -369,9 +380,9 @@ static noinline void __init_refok rest_init(void)
         init_idle_bootup_task(current);
         preempt_enable_no_resched();
         schedule();
-        preempt_disable();
 
         /* Call into cpu_idle with preempt disabled */
+        preempt_disable();
         cpu_idle();
 }
 
@@ -715,10 +726,11 @@ static void __init do_basic_setup(void)
 {
         cpuset_init_smp();
         usermodehelper_init();
-        init_tmpfs();
+        shmem_init();
         driver_init();
         init_irq_proc();
         do_ctors();
+        usermodehelper_enable();
         do_initcalls();
 }