git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2a9b88a
..
23702bb
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-381,9
+381,6
@@
static noinline void __init_refok rest_init(void)
preempt_enable_no_resched();
schedule();
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();
/* 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();
init_irq_proc();
do_ctors();
do_initcalls();
+ usermodehelper_enable();
}
static void __init do_pre_smp_initcalls(void)
}
static void __init do_pre_smp_initcalls(void)