From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sat, 7 Oct 2006 05:19:44 +0000 (-0700)
Subject: [PATCH] swsusp: Make userland suspend work on SMP again
X-Git-Tag: v2.6.19-rc2~279
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5c339d4541995df2fd3ca31a84c042e7afe9b3c1;p=linux-2.6-omap-h63xx.git

[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 72825c853cd..93b5dd283de 100644
--- 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;