Merge linux-2.6 with linux-acpi-2.6

1 files changed, 13 insertions, 1 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index b99f61b82685..396c7873e804 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -29,7 +29,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
         bool "Software Suspend"
-        depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP))
+        depends on PM && SWAP && (X86 || ((FVR || PPC32) && !SMP))
         ---help---
           Enable the possibility of suspending the machine.
           It doesn't need APM.
@@ -73,6 +73,18 @@ 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