[PATCH] swsuspend breakage in 2.6.17-git

[Daniel Ritz <daniel.ritz-ml@swissonline.ch>]

hello

commit b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c:
	[PATCH] swsusp: i386 mark special saveable/unsaveable pages
breaks swsusp for me with a page fault in kernel/power/snapshot.c:save_arch_mem()

the following patch makes suspend-resume working again, but some
problems still remain: fan goes on and stays on after resume (same as
in bug #5000). i guess this is a due to a change in ACPI which i still
have to track down along with the problem that acpi is not powering-off
my other laptop anymore...

comments?

rgds
-daniel


[PATCH] fix swsuspend breakage in 2.6.17-git

trying to save ACPI NVS pages leads to a pagefault on a toshiba
tecra 8000 notebook. back out saving those.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index e602397..c0bdf47 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1490,7 +1490,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 max_low_pfn, it will be