1 files changed, 31 insertions, 10 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 412859f8d94a..c8580a1e6873 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -72,15 +72,10 @@ config PM_TRACE
         CAUTION: this option will cause your machine's real-time clock to be
         set to an invalid time after a resume.
 
-config SUSPEND_SMP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC))
-        depends on SMP
-        default y
-
-config SUSPEND_SMP
+config PM_SLEEP_SMP
         bool
-        depends on SUSPEND_SMP_POSSIBLE && PM_SLEEP
+        depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on PM_SLEEP
         select HOTPLUG_CPU
         default y
 
@@ -89,20 +84,46 @@ 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 !SMP || SUSPEND_SMP_POSSIBLE
+        depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_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).
 
+config HIBERNATION_UP_POSSIBLE
+        bool
+        depends on X86 || PPC64_SWSUSP || FRV || PPC32
+        depends on !SMP
+        default y
+
+config HIBERNATION_SMP_POSSIBLE
+        bool
+        depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP
+        depends on SMP
+        default y
+
 config HIBERNATION
         bool "Hibernation (aka 'suspend to disk')"
         depends on PM && SWAP
-        depends on ((X86 || PPC64_SWSUSP || FRV || PPC32) && !SMP) || SUSPEND_SMP_POSSIBLE
+        depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
         ---help---
           Enable the suspend to disk (STD) functionality, which is usually
           called "hibernation" in user interfaces.  STD checkpoints the