summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-12-08 02:12:39 +0100
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:55 -0500
commit801e4062fda6496fe9bee3e6915a2aa108f974e5 (patch)
tree092e988b58a3dae9135aac742c8318a5963f095f /arch
parent23976728a48c3b76d34e17ead19addd52b3a280e (diff)
downloadlinux-stable-801e4062fda6496fe9bee3e6915a2aa108f974e5.tar.gz
linux-stable-801e4062fda6496fe9bee3e6915a2aa108f974e5.tar.bz2
linux-stable-801e4062fda6496fe9bee3e6915a2aa108f974e5.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig14
-rw-r--r--arch/x86/Kconfig4
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