1 files changed, 16 insertions, 4 deletions

diff --git a/init/main.c b/init/main.c
index d7211faed2a..03b408dff82 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();
 }