[linux-pm] [PATCH 1/4] Hibernate: Call platform_begin before swsusp_shrink_memory

Rafael J. Wysocki rjw at sisk.pl
Sun Oct 26 12:50:26 PDT 2008


From: Zhang Rui <rui.zhang at intel.com>
Subject: 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 at intel.com>
Acked-by: Nigel Cunningham <nigel at tuxonice.net>
Acked-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
 kernel/power/disk.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index c9d7408..096fe48 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -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;
 
-- 
1.5.6



More information about the linux-pm mailing list