I expect http://bugzilla.kernel.org/show_bug.cgi?id=7887 this bug to
pop again with this patch.
Regards,
Alex.
On 5/9/07, Rafael J. Wysocki <[EMAIL PROTECTED]> wrote:
> From: Rafael J. Wysocki <[EMAIL PROTECTED]>
>
> The restore part of the hibernation code should not call any 'platform'
> functions, since it doesn't carry out any power transition of the system.
> Still, such functions are called from the restore code in kernel/power/user.c
> .
> Fix that.
>
> Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
> ---
> kernel/power/user.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> Index: linux-2.6.21/kernel/power/user.c
> ===================================================================
> --- linux-2.6.21.orig/kernel/power/user.c 2007-05-08 22:10:36.000000000
> +0200
> +++ linux-2.6.21/kernel/power/user.c 2007-05-08 23:03:17.000000000 +0200
> @@ -179,34 +179,25 @@ 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)
> - goto Resume_devices;
> + goto Finish;
>
> error = disable_nonboot_cpus();
> if (!error)
> error = swsusp_resume();
>
> enable_nonboot_cpus();
> - Resume_devices:
> - if (platform_suspend)
> - platform_finish();
> -
> + 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
> [EMAIL PROTECTED]
> https://lists.linux-foundation.org/mailman/listinfo/linux-pm
>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Suspend-devel mailing list
Suspend-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/suspend-devel
