---

yaml --- r: 262386 b: refs/heads/master c: 288d5ab h: refs/heads/master v: v3
git-mirror · Aug 4, 2011 · 9422351 · 9422351
1 parent 55213a0
commit 9422351
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f35f2a4ee3abfc0f87990058aa1b6b5092f725
+refs/heads/master: 288d5abec8314ae50fe6692f324b0444acae8486
diff --git a/trunk/init/main.c b/trunk/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();
 }
 

diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c
@@ -274,7 +274,7 @@ static void __call_usermodehelper(struct work_struct *work)
  * (used for preventing user land processes from being created after the user
  * land has been frozen during a system-wide hibernation or suspend operation).
  */
-static int usermodehelper_disabled;
+static int usermodehelper_disabled = 1;
 
 /* Number of helpers running */
 static atomic_t running_helpers = ATOMIC_INIT(0);