* Swsusp trival fix
@ 2005-05-26 6:44 Shaohua Li
2005-05-26 9:38 ` Pavel Machek
0 siblings, 1 reply; 2+ messages in thread
From: Shaohua Li @ 2005-05-26 6:44 UTC (permalink / raw)
To: lkml; +Cc: akpm, Pavel Machek
Pavel,
The below patch fixes a small error in -mm tree. It makes the error
handling process correct, which is introduced by my previous
suspend/resume smp patch.
Thanks,
Shaohua
---
linux-2.6.11-rc5-mm1-root/kernel/power/disk.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN kernel/power/disk.c~swsusp kernel/power/disk.c
--- linux-2.6.11-rc5-mm1/kernel/power/disk.c~swsusp 2005-05-26 14:16:24.789077512 +0800
+++ linux-2.6.11-rc5-mm1-root/kernel/power/disk.c 2005-05-26 14:18:23.369050616 +0800
@@ -135,7 +135,7 @@ static int prepare_processes(void)
if (freeze_processes()) {
error = -EBUSY;
- goto enable_cpu;
+ goto thaw;
}
if (pm_disk_mode == PM_DISK_PLATFORM) {
@@ -150,7 +150,6 @@ static int prepare_processes(void)
return 0;
thaw:
thaw_processes();
-enable_cpu:
enable_nonboot_cpus();
pm_restore_console();
return error;
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Swsusp trival fix
2005-05-26 6:44 Swsusp trival fix Shaohua Li
@ 2005-05-26 9:38 ` Pavel Machek
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Machek @ 2005-05-26 9:38 UTC (permalink / raw)
To: Shaohua Li; +Cc: lkml, akpm
Hi!
> The below patch fixes a small error in -mm tree. It makes the error
> handling process correct, which is introduced by my previous
> suspend/resume smp patch.
My tree changed quite a bit relative to what is in -mm, so it does not
apply here. It looks correct for -mm.
Pavel
> linux-2.6.11-rc5-mm1-root/kernel/power/disk.c | 3 +--
> 1 files changed, 1 insertion(+), 2 deletions(-)
>
> diff -puN kernel/power/disk.c~swsusp kernel/power/disk.c
> --- linux-2.6.11-rc5-mm1/kernel/power/disk.c~swsusp 2005-05-26 14:16:24.789077512 +0800
> +++ linux-2.6.11-rc5-mm1-root/kernel/power/disk.c 2005-05-26 14:18:23.369050616 +0800
> @@ -135,7 +135,7 @@ static int prepare_processes(void)
>
> if (freeze_processes()) {
> error = -EBUSY;
> - goto enable_cpu;
> + goto thaw;
> }
>
> if (pm_disk_mode == PM_DISK_PLATFORM) {
> @@ -150,7 +150,6 @@ static int prepare_processes(void)
> return 0;
> thaw:
> thaw_processes();
> -enable_cpu:
> enable_nonboot_cpus();
> pm_restore_console();
> return error;
> _
>
--
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-05-26 9:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-26 6:44 Swsusp trival fix Shaohua Li
2005-05-26 9:38 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.