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@xxxxxxx>
---
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • Re: linux-next: origin tree build warnings
    ... Andrew Morton wrote: ... Today's linux-next build generated these warnings: ... sending it at the tree maintainer once every couple of ... I'll fix that and set up a git pull containing both ...
    (Linux-Kernel)
  • Re: 2.6.26-rc5-mm2: OOM with 1G free swap
    ... Andrew Morton wrote: ... Andrew please apply this fix. ... fix an error-path-leak type issue with frozen refcount not being ... goto cannot_free; ...
    (Linux-Kernel)
  • 2.4 fix for write throttling on x86 >1G
    ... I've got a fix for you on 2.4. ... spread over highmem in 2.4 ). ... reasons it was actually taking highmem into account. ... send the line "unsubscribe linux-kernel" in ...
    (Linux-Kernel)
  • Re: [PATCH] devmem: handle partial kmem write/read
    ... This patch needs more work. ... ignores the hole silently. ... I'll post a patch including your fix ... written = vwrite(kbuf, (char *p), sz); ...
    (Linux-Kernel)
  • Re: ppc64 build broke between 2.6.11-bk6 and 2.6.11-bk7
    ... > Andrew Morton writes: ... > The patch Andrew mentions above converts the Kconfig entry for FB_MATROX to do a ... matroxfb-compile-error.patch was a valid fix for a compile problem. ... send the line "unsubscribe linux-kernel" in ...
    (Linux-Kernel)