From 49f252e2a09bfaf18c24ace305fb846fd14afb6e Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 23 Jun 2006 02:04:46 -0700
Subject: [PATCH] --- yaml --- r: 29003 b: refs/heads/master c:
 a938c356d5b007fe6d28251c0ddbf6c11d0d92b5 h: refs/heads/master i:   29001:
 cf02846d26108d70570cdeef7a522a914f834de4   28999:
 58d95e1df591d2cf965203bb0c0c3ab6690f0eb3 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/power/swsusp.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6bad7e55aa0..9b5bb9d8c921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e3318dee0878d42ed62a19c292a2ac284135db3
+refs/heads/master: a938c356d5b007fe6d28251c0ddbf6c11d0d92b5
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 78b6e71b0813..f0ee4e7780d6 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -188,8 +188,10 @@ int swsusp_shrink_memory(void)
 			PAGES_FOR_IO;
 		tmp = size;
 		for_each_zone (zone)
-			if (!is_highmem(zone))
+			if (!is_highmem(zone) && populated_zone(zone)) {
 				tmp -= zone->free_pages;
+				tmp += zone->lowmem_reserve[ZONE_NORMAL];
+			}
 		if (tmp > 0) {
 			tmp = __shrink_memory(tmp);
 			if (!tmp)