1 files changed, 6 insertions, 3 deletions

diff --git a/kernel/power/user.c b/kernel/power/user.c
index dd09efe7df54..7cf6713b2325 100644
--- 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();
                 }