[PATCH] swsusp: Make userland suspend work on SMP again

Unfortunately one of the recent changes in swsusp has broken the userland
suspend on SMP.  Fix it.

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

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 72825c853cd7251bf73fa13cbea63e78c09d8845..93b5dd283dea05dcdf7c6f1681f67385292ba9c8 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -145,10 +145,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                        error = freeze_processes();
                        if (error) {
                                thaw_processes();
+                               enable_nonboot_cpus();
                                error = -EBUSY;
                        }
                }
-               enable_nonboot_cpus();
                up(&pm_sem);
                if (!error)
                        data->frozen = 1;