[PATCH] Disable swsusp on CONFIG_HIGHMEM64

[Jan Spitalnik <lkml@spitalnik.net>]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

Hello,

suspending to disk is not supported on CONFIG_HIGHMEM64G setups 
(http://suspend2.net/features). Also suspend to ram doesn't work. This patch 
fixes Kconfig to disallow such combination. I'm not 100% sure about the 
ACPI_SLEEP part, as it might be disabling some working setup - but i think 
that s2r and s2d are the only acpi sleeps allowed, no?

Bye,
	spity

PS: I didn't know that this is not supported so I had some nice oops after 
resume (from ram) and s2d didn't resume at all :-)

-- 
Jan Spitalnik
jan@spitalnik.net

[-- Attachment #2: swsusp-vs-higmem64.patch --]
[-- Type: text/x-diff, Size: 1121 bytes --]

diff --exclude=CVS --exclude=.svn -up --new-file --recursive linux-2.6.old/drivers/acpi/Kconfig linux-2.6/drivers/acpi/Kconfig
--- linux-2.6.old/drivers/acpi/Kconfig	2006-01-06 18:58:10.000000000 +0100
+++ linux-2.6/drivers/acpi/Kconfig	2006-01-06 19:07:34.000000000 +0100
@@ -46,7 +46,7 @@ if ACPI
 
 config ACPI_SLEEP
 	bool "Sleep States"
-	depends on X86 && (!SMP || SUSPEND_SMP)
+	depends on X86 && (!SMP || SUSPEND_SMP) && !HIGHMEM64G
 	depends on PM
 	default y
 	---help---
diff --exclude=CVS --exclude=.svn -up --new-file --recursive linux-2.6.old/kernel/power/Kconfig linux-2.6/kernel/power/Kconfig
--- linux-2.6.old/kernel/power/Kconfig	2006-01-06 18:58:28.000000000 +0100
+++ linux-2.6/kernel/power/Kconfig	2006-01-06 19:07:43.000000000 +0100
@@ -38,7 +38,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
-	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP)
+	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP) && !HIGHMEM64G) || ((FVR || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.