X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=init%2Fmain.c;h=9c51ee7adf3d7edb01bfc501488389d4ca1c45fc;hb=75ef8b3b9c0b76eb5a16cd838cb99a7deecceb85;hp=d7211faed2adfb295caf46bbb9c70835f622eabe;hpb=62c9072bee2272232d0ed92dc8148c48c1f10f8e;p=mv-sheeva.git

diff --git a/init/main.c b/init/main.c
index d7211faed2a..9c51ee7adf3 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();