* [PATCH -mm] swsusp: fix possible lockup in user interface
@ 2006-01-22 17:20 Rafael J. Wysocki
2006-01-22 20:19 ` Pavel Machek
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2006-01-22 17:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: Pavel Machek, LKML
Hi,
The appended patch fixes possible system lockup that may result from
calling pm_prepare_console() after processes has been frozen.
Please apply.
Greetings,
Rafael
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
kernel/power/user.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
Index: linux-2.6.16-rc1-mm2/kernel/power/user.c
===================================================================
--- linux-2.6.16-rc1-mm2.orig/kernel/power/user.c 2006-01-21 23:42:32.000000000 +0100
+++ linux-2.6.16-rc1-mm2/kernel/power/user.c 2006-01-22 17:49:07.000000000 +0100
@@ -141,9 +141,14 @@ static int snapshot_ioctl(struct inode *
break;
sys_sync();
down(&pm_sem);
+ pm_prepare_console();
disable_nonboot_cpus();
- if (freeze_processes())
+ if (freeze_processes()) {
+ thaw_processes();
+ enable_nonboot_cpus();
+ pm_restore_console();
error = -EBUSY;
+ }
up(&pm_sem);
if (!error)
data->frozen = 1;
@@ -155,6 +160,7 @@ static int snapshot_ioctl(struct inode *
down(&pm_sem);
thaw_processes();
enable_nonboot_cpus();
+ pm_restore_console();
up(&pm_sem);
data->frozen = 0;
break;
@@ -165,7 +171,6 @@ static int snapshot_ioctl(struct inode *
break;
}
down(&pm_sem);
- pm_prepare_console();
/* Free memory before shutting down devices. */
error = swsusp_shrink_memory();
if (!error) {
@@ -176,7 +181,6 @@ static int snapshot_ioctl(struct inode *
device_resume();
}
}
- pm_restore_console();
up(&pm_sem);
if (!error)
error = put_user(in_suspend, (unsigned int __user *)arg);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -mm] swsusp: fix possible lockup in user interface
2006-01-22 17:20 [PATCH -mm] swsusp: fix possible lockup in user interface Rafael J. Wysocki
@ 2006-01-22 20:19 ` Pavel Machek
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Machek @ 2006-01-22 20:19 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Andrew Morton, LKML
On Ne 22-01-06 18:20:15, Rafael J. Wysocki wrote:
> Hi,
>
> The appended patch fixes possible system lockup that may result from
> calling pm_prepare_console() after processes has been frozen.
>
> Please apply.
Looks okay to me.
Pavel
--
Thanks, Sharp!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-22 20:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-22 17:20 [PATCH -mm] swsusp: fix possible lockup in user interface Rafael J. Wysocki
2006-01-22 20:19 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®