aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangyanqing <udknight@gmail.com>2011-09-29 15:09:40 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-29 19:21:01 -0700
commitb0f84374b6ab0dc9c47975df0b02d46165d558d4 (patch)
tree57e9d9bee80c89c92265df75aa579222b994b38f
parentd5767c53535ac79758084773418e0ad186aba4a2 (diff)
downloadlinux-3.0-android-ux500-b0f84374b6ab0dc9c47975df0b02d46165d558d4.tar.gz
bootup: move 'usermodehelper_enable()' a little earlier
Commit d5767c53535a ("bootup: move 'usermodehelper_enable()' to the end of do_basic_setup()") moved 'usermodehelper_enable()' to end of do_basic_setup() to after the initcalls. But then I get failed to let uvesafb work on my computer, and lose the splash boot. So maybe we could start usermodehelper_enable a little early to make some task work that need eary init with the help of user mode. [ I would *really* prefer that initcalls not call into user space - even the real 'init' hasn't been execve'd yet, after all! But for uvesafb it really does look like we don't have much choice. I considered doing this when we mount the root filesystem, but depending on config options that is in multiple places. We could do the usermode helper enable as a rootfs_initcall().. So I'm just using wang yanqing's trivial patch. It's not wonderful, but it's simple and should work. We should revisit this some day, though. - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 23702bbdbc1..03b408dff82 100644
--- a/init/main.c
+++ b/init/main.c
@@ -730,8 +730,8 @@ static void __init do_basic_setup(void)
driver_init();
init_irq_proc();
do_ctors();
- do_initcalls();
usermodehelper_enable();
+ do_initcalls();
}
static void __init do_pre_smp_initcalls(void)