Skip to contentSkip to conversation

Swsusp trival fix

PATCH Shaohua Li 2 participants 2 messages May 26, 2005

Subsystems (2)
lore
Share & tools
lore

Shaohua Li

author
#0 lore 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(-)
kernel/power/disk.c renamed from kernel/power/disk.c~swsusp +1 -2
diff -puN kernel/power/disk.c~swsusp kernel/power/disk.c
@@ -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;

_

#1 lore raw

Hi!

Quoted 3 lines

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

Quoted 25 lines
 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

kernel/power/disk.c renamed from kernel/power/disk.c~swsusp +1 -2
@@ -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;

_