On Wednesday, 2 May 2007 13:41, Marcus Better wrote:
> Rafael J. Wysocki wrote:
> > OK, so please run with it applied for a while to make sure it helps.
>
> I have tested some more, and it seems to work. There was only the one reboot
> during writing that happened on my first attempt, but it hasn't happened
> since then.
Could you please test the appended patch instead of the previous one?
Rafael
---
kernel/power/disk.c | 4 +++-
kernel/power/user.c | 15 +++------------
2 files changed, 6 insertions(+), 13 deletions(-)
Index: linux-2.6.21/kernel/power/disk.c
===================================================================
--- linux-2.6.21.orig/kernel/power/disk.c 2007-05-02 22:09:55.000000000 +0200
+++ linux-2.6.21/kernel/power/disk.c 2007-05-02 22:18:06.000000000 +0200
@@ -215,7 +215,9 @@ int hibernate(void)
Enable_cpus:
enable_nonboot_cpus();
Resume_devices:
- platform_finish();
+ if (error)
+ platform_finish();
+
device_resume();
resume_console();
Thaw:
Index: linux-2.6.21/kernel/power/user.c
===================================================================
--- linux-2.6.21.orig/kernel/power/user.c 2007-05-02 22:09:55.000000000 +0200
+++ linux-2.6.21/kernel/power/user.c 2007-05-02 22:18:06.000000000 +0200
@@ -169,7 +169,7 @@ static inline int snapshot_suspend(int p
}
enable_nonboot_cpus();
Resume_devices:
- if (platform_suspend)
+ if (platform_suspend && (!in_suspend || error))
platform_finish();
device_resume();
@@ -179,17 +179,12 @@ static inline int snapshot_suspend(int p
return error;
}
-static inline int snapshot_restore(int platform_suspend)
+static inline int snapshot_restore(void)
{
int error;
mutex_lock(&pm_mutex);
pm_prepare_console();
- if (platform_suspend) {
- error = platform_prepare();
- if (error)
- goto Finish;
- }
suspend_console();
error = device_suspend(PMSG_PRETHAW);
if (error)
@@ -201,12 +196,8 @@ static inline int snapshot_restore(int p
enable_nonboot_cpus();
Resume_devices:
- if (platform_suspend)
- platform_finish();
-
device_resume();
resume_console();
- Finish:
pm_restore_console();
mutex_unlock(&pm_mutex);
return error;
@@ -272,7 +263,7 @@ static int snapshot_ioctl(struct inode *
error = -EPERM;
break;
}
- error = snapshot_restore(data->platform_suspend);
+ error = snapshot_restore();
break;
case SNAPSHOT_FREE:
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
