---

yaml --- r: 29003 b: refs/heads/master c: a938c35 h: refs/heads/master i: 29001: cf02846 28999: 58d95e1 v: v3
git-mirror · Jun 23, 2006 · 49f252e · 49f252e
1 parent 3656550
commit 49f252e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)