The patch titled
fix swsuspend breakage
has been added to the -mm tree. Its filename is
x86_64-fix-swsuspend-breakage.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix swsuspend breakage
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>
On x86, trying to save ACPI NVS pages leads to a pagefault on a toshiba tecra
8000 notebook. Apply the same fix to x86_64.
Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Shaohua Li <shaohua.li@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/i386/kernel/setup.c~x86_64-fix-swsuspend-breakage arch/i386/kernel/setup.c
diff -puN arch/x86_64/kernel/setup.c~x86_64-fix-swsuspend-breakage arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c~x86_64-fix-swsuspend-breakage
+++ a/arch/x86_64/kernel/setup.c
@@ -570,7 +570,7 @@ static void __init e820_save_acpi_pages(
end = ei->addr + ei->size;
if (start >= end)
continue;
- if (ei->type != E820_ACPI && ei->type != E820_NVS)
+ if (ei->type != E820_ACPI)
continue;
/*
* If the region is below end_pfn, it will be
_
Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are
git-pcmcia.patch
fix-swsuspend-breakage.patch
x86_64-fix-swsuspend-breakage.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
