Re: 2.6.19-rc2-mm1

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Tuesday, 17 October 2006 08:06, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19-rc2/2.6.19-rc2-mm1/
> 
[--snip--]
> 
> +swsusp-improve-handling-of-highmem.patch

This patch needs the following small fix so that image_size is used
properly on systems with lots of highmem:

---
Fix swsusp to use image_size as documented on systems with lots of highmem.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/power/swsusp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.19-rc2-mm1/kernel/power/swsusp.c
===================================================================
--- linux-2.6.19-rc2-mm1.orig/kernel/power/swsusp.c
+++ linux-2.6.19-rc2-mm1/kernel/power/swsusp.c
@@ -195,6 +195,7 @@ int swsusp_shrink_memory(void)
 		highmem_size = count_highmem_pages();
 		size = count_data_pages() + PAGES_FOR_IO;
 		tmp = size;
+		size += highmem_size;
 		for_each_zone (zone)
 			if (populated_zone(zone)) {
 				if (is_highmem(zone)) {
@@ -209,7 +210,6 @@ int swsusp_shrink_memory(void)
 		if (highmem_size < 0)
 			highmem_size = 0;
 
-		size += highmem_size;
 		tmp += highmem_size;
 		if (tmp > 0) {
 			tmp = __shrink_memory(tmp);