1 files changed, 35 insertions, 30 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 8e186c678149..ef9b802738a5 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -44,9 +44,30 @@ config PM_VERBOSE
         ---help---
         This option enables verbose messages from the Power Management code.
 
+config CAN_PM_TRACE
+        def_bool y
+        depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL
+
 config PM_TRACE
+        bool
+        help
+          This enables code to save the last PM event point across
+          reboot. The architecture needs to support this, x86 for
+          example does by saving things in the RTC, see below.
+
+          The architecture specific code must provide the extern
+          functions from <linux/resume-trace.h> as well as the
+          <asm/resume-trace.h> header with a TRACE_RESUME() macro.
+
+          The way the information is presented is architecture-
+          dependent, x86 will print the information during a
+          late_initcall.
+
+config PM_TRACE_RTC
         bool "Suspend/resume event tracing"
-        depends on PM_DEBUG && X86 && PM_SLEEP && EXPERIMENTAL
+        depends on CAN_PM_TRACE
+        depends on X86
+        select PM_TRACE
         default n
         ---help---
         This enables some cheesy code to save the last PM event point in the
@@ -63,7 +84,8 @@ config PM_TRACE
 
 config PM_SLEEP_SMP
         bool
-        depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on SMP
+        depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
         depends on PM_SLEEP
         select HOTPLUG_CPU
         default y
@@ -73,46 +95,29 @@ config PM_SLEEP
         depends on SUSPEND || HIBERNATION
         default y
 
-config SUSPEND_UP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
-                   || SUPERH || FRV
-        depends on !SMP
-        default y
-
-config SUSPEND_SMP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) \
-                   || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM
-        depends on SMP
-        default y
-
 config SUSPEND
         bool "Suspend to RAM and standby"
-        depends on PM
-        depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
+        depends on PM && ARCH_SUSPEND_POSSIBLE
         default y
         ---help---
           Allow the system to enter sleep states in which main memory is
           powered and thus its contents are preserved, such as the
-          suspend-to-RAM state (i.e. the ACPI S3 state).
+          suspend-to-RAM state (e.g. the ACPI S3 state).
 
-config HIBERNATION_UP_POSSIBLE
-        bool
-        depends on X86 || PPC64_SWSUSP || PPC32
-        depends on !SMP
+config SUSPEND_FREEZER
+        bool "Enable freezer for suspend to RAM/standby" \
+                if ARCH_WANTS_FREEZER_CONTROL || BROKEN
+        depends on SUSPEND
         default y
+        help
+          This allows you to turn off the freezer for suspend. If this is
+          done, no tasks are frozen for suspend to RAM/standby.
 
-config HIBERNATION_SMP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP
-        depends on SMP
-        default y
+          Turning OFF this setting is NOT recommended! If in doubt, say Y.
 
 config HIBERNATION
         bool "Hibernation (aka 'suspend to disk')"
-        depends on PM && SWAP
-        depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
         ---help---
           Enable the suspend to disk (STD) functionality, which is usually
           called "hibernation" in user interfaces.  STD checkpoints the