Re: [PATCH 1/4] Hibernate: Call platform_begin before swsusp_shrink_memory

Nigel Cunningham
2008-10-22T22:37:52Z

Hi.

On Wed, 2008-10-22 at 22:50 +0200, Rafael J. Wysocki wrote:
> From: Zhang Rui <rui.zhang@intel.com>
>
> Hibernate: Call platform_begin before swsusp_shrink_memory
>
> Call platform_begin() before swsusp_shrink_memory() so that we can
> always allocate enough memory to save the ACPI NVS region from
> platform_begin().
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
> kernel/power/disk.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Index: linux-2.6/kernel/power/disk.c
> ===================================================================
> --- linux-2.6.orig/kernel/power/disk.c
> +++ linux-2.6/kernel/power/disk.c
> @@ -267,12 +267,12 @@ int hibernation_snapshot(int platform_mo
> {
> int error, ftrace_save;
>
> - /* Free memory before shutting down devices. */
> - error = swsusp_shrink_memory();
> + error = platform_begin(platform_mode);
> if (error)
> return error;
>
> - error = platform_begin(platform_mode);
> + /* Free memory before shutting down devices. */
> + error = swsusp_shrink_memory();
> if (error)
> goto Close;
>

Acked-by: Nigel Cunningham <nigel@tuxonice.net>