[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200610171517.23271.rjw@sisk.pl>
Date: Tue, 17 Oct 2006 15:17:22 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Andrew Morton <akpm@...l.org>
Cc: linux-kernel@...r.kernel.org, Pavel Machek <pavel@....cz>
Subject: Re: 2.6.19-rc2-mm1
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@...k.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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists