Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[mv-sheeva.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 47613dfb7b28c340825493ed36a4c3347a39290d..ddc7644c1305cf926364b0d1682e5d668367f08b 100644 (file)
--- a/kernel/kmod.c
+++ b/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);