Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index ed49ffd..ce0dfb8 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,5 +1,6 @@
 config PM
        bool "Power Management support"
 config PM
        bool "Power Management support"

+       depends on !IA64_HP_SIM

        ---help---
          "Power Management" means that parts of your computer are shut
          off or put into a power conserving "sleep" mode if they are not
        ---help---
          "Power Management" means that parts of your computer are shut
          off or put into a power conserving "sleep" mode if they are not


@@ -18,6 +19,15 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 

+config PM_LEGACY
+       bool "Legacy Power Management API"
+       depends on PM
+       default y
+       ---help---
+          Support for pm_register() and friends.
+
+          If unsure, say Y.
+

 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM


@@ -27,11 +37,11 @@ config PM_DEBUG
        like suspend support.
 
 config SOFTWARE_SUSPEND
        like suspend support.
 
 config SOFTWARE_SUSPEND

-       bool "Software Suspend (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PM && SWAP
+       bool "Software Suspend"
+       depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)

        ---help---
          Enable the possibility of suspending the machine.
        ---help---
          Enable the possibility of suspending the machine.

-         It doesn't need APM.
+         It doesn't need ACPI or APM.

          You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
          (patch for sysvinit needed). 
 
          You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
          (patch for sysvinit needed). 
 


@@ -48,7 +58,7 @@ config SOFTWARE_SUSPEND
          involved in suspending. Also in this case there is a risk that buffers
          on disk won't match with saved ones.
 
          involved in suspending. Also in this case there is a risk that buffers
          on disk won't match with saved ones.
 

-         For more information take a look at Documentation/power/swsusp.txt.
+         For more information take a look at <file:Documentation/power/swsusp.txt>.

 
 config PM_STD_PARTITION
        string "Default resume partition"
 
 config PM_STD_PARTITION
        string "Default resume partition"


@@ -72,3 +82,19 @@ config PM_STD_PARTITION
          suspended image to. It will simply pick the first available swap 
          device.
 
          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
+       default y