ARM: 7072/1: debug: use kconfig choice for selecting DEBUG_LL UART

[firefly-linux-kernel-4.4.55.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 1952d37e4ecbd7548a24f247a983bbd0f97051ce..9c51ee7adf3d7edb01bfc501488389d4ca1c45fc 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -369,9 +369,12 @@ static noinline void __init_refok rest_init(void)
        init_idle_bootup_task(current);
        preempt_enable_no_resched();
        schedule();
-       preempt_disable();
+
+       /* At this point, we can enable user mode helper functionality */
+       usermodehelper_enable();
 
        /* Call into cpu_idle with preempt disabled */
+       preempt_disable();
        cpu_idle();
 }