From 942235120cd6b76976eff2a8d3b522367cd8d33f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 3 Aug 2011 22:03:29 -1000 Subject: [PATCH] --- yaml --- r: 262386 b: refs/heads/master c: 288d5abec8314ae50fe6692f324b0444acae8486 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/main.c | 5 ++++- trunk/kernel/kmod.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a29233cec086..6ed63daccb5c 100644 --- 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 index 1952d37e4ecb..9c51ee7adf3d 100644 --- 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 index 47613dfb7b28..ddc7644c1305 100644 --- 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);