Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index fc311a4673a25e451e94c1eef38c00bc425acf5a..619ecabf7c581870e328588b8c0cc6567d9b9f67 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -38,16 +38,25 @@ config PM_DEBUG
 
 config PM_TRACE
        bool "Suspend/resume event tracing"
-       depends on PM && PM_DEBUG && X86_32
-       default y
+       depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
+       default n
        ---help---
        This enables some cheesy code to save the last PM event point in the
        RTC across reboots, so that you can debug a machine that just hangs
        during suspend (or more commonly, during resume).
 
+       To use this debugging feature you should attempt to suspend the machine,
+       then reboot it, then run
+
+               dmesg -s 1000000 | grep 'hash matches'
+
+       CAUTION: this option will cause your machine's real-time clock to be
+       set to an invalid time after a resume.
+
+
 config SOFTWARE_SUSPEND
        bool "Software Suspend"
-       depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
+       depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || PPC32) && !SMP))
        ---help---
          Enable the possibility of suspending the machine.
          It doesn't need ACPI or APM.
@@ -69,6 +78,10 @@ config SOFTWARE_SUSPEND
 
          For more information take a look at <file:Documentation/power/swsusp.txt>.
 
+         (For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
+         we need identity mapping for resume to work, and that is trivial
+         to get with 4MB pages, but less than trivial on PAE).
+
 config PM_STD_PARTITION
        string "Default resume partition"
        depends on SOFTWARE_SUSPEND
@@ -91,18 +104,6 @@ config PM_STD_PARTITION
          suspended image to. It will simply pick the first available swap 
          device.
 
-config SWSUSP_ENCRYPT
-       bool "Encrypt suspend image"
-       depends on SOFTWARE_SUSPEND && CRYPTO=y && (CRYPTO_AES=y || CRYPTO_AES_586=y || CRYPTO_AES_X86_64=y)
-       default ""
-       ---help---
-         To prevent data gathering from swap after resume you can encrypt
-         the suspend image with a temporary key that is deleted on
-         resume.
-
-         Note that the temporary key is stored unencrypted on disk while the
-         system is suspended.
-
 config SUSPEND_SMP
        bool
        depends on HOTPLUG_CPU && X86 && PM