Hibernation: Clean up Kconfig (V2)

This cleans up the hibernation Kconfig and removes the need to
declare centrally which architectures support hibernation. All
architectures that currently support hibernation are modified
accordingly.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Paul Mackerras <paulus@samba.org>
Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

2 files changed, 16 insertions, 2 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9c44af3db8d9..68f0cf730d7f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -151,9 +151,19 @@ config DEFAULT_UIMAGE
 config REDBOOT
         bool
 
-config PPC64_SWSUSP
+config HIBERNATE_32
         bool
-        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
+        depends on (PPC_PMAC && !SMP) || BROKEN
+        default y
+
+config HIBERNATE_64
+        bool
+        depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL)
+        default y
+
+config ARCH_HIBERNATION_POSSIBLE
+        bool
+        depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32)
         default y
 
 config PPC_DCR_NATIVE
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 93e66678e158..120070cbedd2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -112,6 +112,10 @@ config ARCH_SUPPORTS_OPROFILE
 
 select HAVE_KVM
 
+config ARCH_HIBERNATION_POSSIBLE
+        def_bool y
+        depends on !SMP || !X86_VOYAGER
+
 config ZONE_DMA32
         bool
         default X86_64