From: Shaohua Li <shaohua.li@intel.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@osdl.org>, Pavel Machek <pavel@ucw.cz>
Subject: Swsusp trival fix
Date: Thu, 26 May 2005 14:44:02 +0800 [thread overview]
Message-ID: <1117089842.8005.5.camel@linux-hp.sh.intel.com> (raw)
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;
_
next reply other threads:[~2005-05-26 6:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-26 6:44 Shaohua Li [this message]
2005-05-26 9:38 ` Swsusp trival fix Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1117089842.8005.5.camel@linux-hp.sh.intel.com \
--to=shaohua.li@intel.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox