The patch titled
swsusp-add-architecture-special-saveable-pages fix (i386)
has been added to the -mm tree. Its filename is
swsusp-i386-mark-special-saveable-unsaveable-pages-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Shaohua Li <shaohua.li@xxxxxxxxx>
Architecture special saveable memory might not be aligned to PAGE_SIZE.
We should just save part of a page in the unaligned case. We changed
swsusp_add_arch_pages to accept an 'address' instead of a 'pfn'.
Signed-off-by: Shaohua Li <shaohua.li@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Nigel Cunningham <nigel@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/setup.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN arch/i386/kernel/setup.c~swsusp-i386-mark-special-saveable-unsaveable-pages-fix arch/i386/kernel/setup.c
--- devel/arch/i386/kernel/setup.c~swsusp-i386-mark-special-saveable-unsaveable-pages-fix 2006-04-20 01:10:43.000000000 -0700
+++ devel-akpm/arch/i386/kernel/setup.c 2006-04-20 01:10:43.000000000 -0700
@@ -1482,8 +1482,8 @@ static void __init e820_save_acpi_pages(
struct e820entry *ei = &e820.map[i];
unsigned long start, end;
- start = PFN_DOWN(ei->addr);
- end = PFN_UP(ei->addr + ei->size);
+ start = ei->addr;
+ end = ei->addr + ei->size;
if (start >= end)
continue;
if (ei->type != E820_ACPI && ei->type != E820_NVS)
@@ -1492,15 +1492,15 @@ static void __init e820_save_acpi_pages(
* If the region is below max_low_pfn, it will be
* saved/restored by swsusp follow 'RAM' type.
*/
- if (start < max_low_pfn)
- start = max_low_pfn;
+ if (start < (max_low_pfn << PAGE_SHIFT))
+ start = max_low_pfn << PAGE_SHIFT;
/*
* Highmem pages (ACPI NVS/Data) are reserved, but swsusp
* highmem save/restore will not save/restore them. We marked
* them as arch saveable pages here
*/
if (end > start)
- swsusp_add_arch_pages(start, end - 1);
+ swsusp_add_arch_pages(start, end);
}
}
_
Patches currently in -mm which might be from shaohua.li@xxxxxxxxx are
git-acpi.patch
x86-cpu_init-avoid-gfp_kernel-allocation-while-atomic.patch
swsusp-add-architecture-special-saveable-pages-support.patch
swsusp-add-architecture-special-saveable-pages-fix.patch
swsusp-i386-mark-special-saveable-unsaveable-pages.patch
swsusp-i386-mark-special-saveable-unsaveable-pages-fix.patch
swsusp-x86_64-mark-special-saveable-unsaveable-pages.patch
swsusp-x86_64-mark-special-saveable-unsaveable-pages-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
