[PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
the suspend, although it should do this.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/power/user.c b/kernel/power/user.c
index d6a8dcc26ae552d94f38d456b38a5ce1821e4071..bf211fee122279b98598692e8f076522e314ccfd 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -368,9 +368,12 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                if (error) {
                        printk(KERN_ERR "Failed to suspend some devices.\n");
                } else {
-                       /* Enter S3, system is already frozen */
-                       suspend_enter(PM_SUSPEND_MEM);
-
+                       error = disable_nonboot_cpus();
+                       if (!error) {
+                               /* Enter S3, system is already frozen */
+                               suspend_enter(PM_SUSPEND_MEM);
+                               enable_nonboot_cpus();
+                       }
                        /* Wake up devices */
                        device_resume();
                }