bootup: move 'usermodehelper_enable()' to the end of do_basic_setup()

[pandora-kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 9c51ee7..23702bb 100644 (file)
--- 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);
@@ -370,9 +381,6 @@ static noinline void __init_refok rest_init(void)
        preempt_enable_no_resched();
        schedule();
 
-       /* At this point, we can enable user mode helper functionality */
-       usermodehelper_enable();
-
        /* Call into cpu_idle with preempt disabled */
        preempt_disable();
        cpu_idle();
@@ -723,6 +731,7 @@ static void __init do_basic_setup(void)
        init_irq_proc();
        do_ctors();
        do_initcalls();
+       usermodehelper_enable();
 }
 
 static void __init do_pre_smp_initcalls(void)