---

yaml --- r: 264178 b: refs/heads/master c: d5767c5 h: refs/heads/master v: v3
git-mirror · Sep 28, 2011 · aa2e78e · aa2e78e
1 parent 9f92f19
commit aa2e78e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ef7b45a5925c54d948f858e42babb0533b9a3c5
+refs/heads/master: d5767c53535ac79758084773418e0ad186aba4a2
diff --git a/trunk/init/main.c b/trunk/init/main.c
@@ -381,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();
@@ -734,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)