diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-10-07 07:19:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 19:51:14 +0200 |
| commit | 5c339d4541995df2fd3ca31a84c042e7afe9b3c1 (patch) | |
| tree | 30c0470cd8b3f2be514b03328d6c0519fc6ed7b8 /kernel | |
| parent | [PATCH] slab: remove wrongly placed BUG_ON (diff) | |
| download | linux-5c339d4541995df2fd3ca31a84c042e7afe9b3c1.tar.xz linux-5c339d4541995df2fd3ca31a84c042e7afe9b3c1.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 72825c853cd7..93b5dd283dea 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; |