From aa2e78ef76514997d3c0a3be470996d68b3d9c86 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 28 Sep 2011 10:23:44 -0700 Subject: [PATCH] --- yaml --- r: 264178 b: refs/heads/master c: d5767c53535ac79758084773418e0ad186aba4a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0e2d74400495..49108488c4cc 100644 --- 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 index 2a9b88aa5e76..23702bbdbc1d 100644 --- 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)