aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 2a9b88aa5e76..23702bbdbc1d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -381,9 +381,6 @@ static noinline void __init_refok rest_init(void)
381 preempt_enable_no_resched(); 381 preempt_enable_no_resched();
382 schedule(); 382 schedule();
383 383
384 /* At this point, we can enable user mode helper functionality */
385 usermodehelper_enable();
386
387 /* Call into cpu_idle with preempt disabled */ 384 /* Call into cpu_idle with preempt disabled */
388 preempt_disable(); 385 preempt_disable();
389 cpu_idle(); 386 cpu_idle();
@@ -734,6 +731,7 @@ static void __init do_basic_setup(void)
734 init_irq_proc(); 731 init_irq_proc();
735 do_ctors(); 732 do_ctors();
736 do_initcalls(); 733 do_initcalls();
734 usermodehelper_enable();
737} 735}
738 736
739static void __init do_pre_smp_initcalls(void) 737static void __init do_pre_smp_initcalls(void)