Commit 3fe0313e authored Oct 26, 2008 by Zhang Rui Committed by Len Brown Dec 19, 2008

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>
Acked-by: Nigel Cunningham <nigel@tuxonice.net>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 929096fe

kernel/power/disk.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -259,12 +259,12 @@ int hibernation_snapshot(int platform_mode)
		{
		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;