1 files changed, 5 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index d7211faed2ad..9c51ee7adf3d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -369,9 +369,12 @@ static noinline void __init_refok rest_init(void)
         init_idle_bootup_task(current);
         preempt_enable_no_resched();
         schedule();
-        preempt_disable();
+
+        /* At this point, we can enable user mode helper functionality */
+        usermodehelper_enable();
 
         /* Call into cpu_idle with preempt disabled */
+        preempt_disable();
         cpu_idle();
 }
 
@@ -715,7 +718,7 @@ static void __init do_basic_setup(void)
 {
         cpuset_init_smp();
         usermodehelper_init();
-        init_tmpfs();
+        shmem_init();
         driver_init();
         init_irq_proc();
         do_ctors();