3 files changed, 27 insertions, 1 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index bbd85c60f741..331f9836383f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -14,6 +14,7 @@
 #include <linux/reboot.h>
 #include <linux/string.h>
 #include <linux/device.h>
+#include <linux/kmod.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
@@ -520,6 +521,10 @@ int hibernate(void)
         if (error)
                 goto Exit;
 
+        error = usermodehelper_disable();
+        if (error)
+                goto Exit;
+
         /* Allocate memory management structures */
         error = create_basic_memory_bitmaps();
         if (error)
@@ -558,6 +563,7 @@ int hibernate(void)
         thaw_processes();
  Finish:
         free_basic_memory_bitmaps();
+        usermodehelper_enable();
  Exit:
         pm_notifier_call_chain(PM_POST_HIBERNATION);
         pm_restore_console();
@@ -634,6 +640,10 @@ static int software_resume(void)
         if (error)
                 goto Finish;
 
+        error = usermodehelper_disable();
+        if (error)
+                goto Finish;
+
         error = create_basic_memory_bitmaps();
         if (error)
                 goto Finish;
@@ -656,6 +666,7 @@ static int software_resume(void)
         thaw_processes();
  Done:
         free_basic_memory_bitmaps();
+        usermodehelper_enable();
  Finish:
         pm_notifier_call_chain(PM_POST_RESTORE);
         pm_restore_console();
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 540b16b68565..19122cf6d827 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
@@ -237,6 +238,10 @@ static int suspend_prepare(void)
         if (error)
                 goto Finish;
 
+        error = usermodehelper_disable();
+        if (error)
+                goto Finish;
+
         if (suspend_freeze_processes()) {
                 error = -EAGAIN;
                 goto Thaw;
@@ -256,6 +261,7 @@ static int suspend_prepare(void)
 
  Thaw:
         suspend_thaw_processes();
+        usermodehelper_enable();
  Finish:
         pm_notifier_call_chain(PM_POST_SUSPEND);
         pm_restore_console();
@@ -376,6 +382,7 @@ int suspend_devices_and_enter(suspend_state_t state)
 static void suspend_finish(void)
 {
         suspend_thaw_processes();
+        usermodehelper_enable();
         pm_notifier_call_chain(PM_POST_SUSPEND);
         pm_restore_console();
 }
diff --git a/kernel/power/user.c b/kernel/power/user.c
index a6332a313262..005b93d839ba 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -212,13 +212,20 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
         case SNAPSHOT_FREEZE:
                 if (data->frozen)
                         break;
+
                 printk("Syncing filesystems ... ");
                 sys_sync();
                 printk("done.\n");
 
-                error = freeze_processes();
+                error = usermodehelper_disable();
                 if (error)
+                        break;
+
+                error = freeze_processes();
+                if (error) {
                         thaw_processes();
+                        usermodehelper_enable();
+                }
                 if (!error)
                         data->frozen = 1;
                 break;
@@ -227,6 +234,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 if (!data->frozen || data->ready)
                         break;
                 thaw_processes();
+                usermodehelper_enable();
                 data->frozen = 0;
                 break;