fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 696387f..ed29622 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,5 +1,6 @@
 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
@@ -18,6 +19,16 @@ config PM
          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 (DEPRECATED)"
+       depends on PM
+       default n
+       ---help---
+          Support for pm_register() and friends.  This old API is obsoleted
+          by the driver model.
+
+          If unsure, say N.
+
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
@@ -26,12 +37,52 @@ config PM_DEBUG
        code. This is helpful when debugging and reporting various PM bugs, 
        like suspend support.
 
+config DISABLE_CONSOLE_SUSPEND
+       bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
+       depends on PM && PM_DEBUG
+       default n
+       ---help---
+       This option turns off the console suspend mechanism that prevents
+       debug messages from reaching the console during the suspend/resume
+       operations.  This may be helpful when debugging device drivers'
+       suspend/resume routines, but may itself lead to problems, for example
+       if netconsole is used.
+
+config PM_TRACE
+       bool "Suspend/resume event tracing"
+       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 PM_SYSFS_DEPRECATED
+       bool "Driver model /sys/devices/.../power/state files (DEPRECATED)"
+       depends on PM && SYSFS
+       default n
+       help
+         The driver model started out with a sysfs file intended to provide
+         a userspace hook for device power management.  This feature has never
+         worked very well, except for limited testing purposes, and so it will
+         be removed.   It's not clear that a generic mechanism could really
+         handle the wide variability of device power states; any replacements
+         are likely to be bus or driver specific.
+
 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.
-         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). 
 
@@ -50,6 +101,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
@@ -72,3 +127,7 @@ config PM_STD_PARTITION
          suspended image to. It will simply pick the first available swap 
          device.
 
+config SUSPEND_SMP
+       bool
+       depends on HOTPLUG_CPU && X86 && PM
+       default y