Re: Swsusp trival fix
From: Pavel Machek (pavel_at_suse.cz)
Date: 05/26/05
- Previous message: Ivan Kokshaysky: "Re: [patch 2/2] x86_64: Collect host bridge resources"
- In reply to: Shaohua Li: "Swsusp trival fix"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Thu, 26 May 2005 11:38:27 +0200 To: Shaohua Li <shaohua.li@intel.com>
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;
> _
>
-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Ivan Kokshaysky: "Re: [patch 2/2] x86_64: Collect host bridge resources"
- In reply to: Shaohua Li: "Swsusp trival fix"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]