openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2007-12-08 02:12:39 +01:00 committed by Len Brown
parent 23976728a4
commit 801e4062fd
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/Kconfig
View File

@ -151,9 +151,19 @@ config DEFAULT_UIMAGE
config REDBOOT config REDBOOT
bool bool
config PPC64_SWSUSP config HIBERNATE_32
bool 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 default y
config PPC_DCR_NATIVE config PPC_DCR_NATIVE

4
arch/x86/Kconfig
View File

@ -112,6 +112,10 @@ config ARCH_SUPPORTS_OPROFILE
select HAVE_KVM select HAVE_KVM
config ARCH_HIBERNATION_POSSIBLE
def_bool y
depends on !SMP || !X86_VOYAGER
config ZONE_DMA32 config ZONE_DMA32
bool bool
default X86_64 default X86_64

18
kernel/power/Kconfig
View File

@ -84,7 +84,8 @@ config PM_TRACE_RTC
config PM_SLEEP_SMP config PM_SLEEP_SMP
bool bool
depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE depends on SMP
depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP depends on PM_SLEEP
select HOTPLUG_CPU select HOTPLUG_CPU
default y default y
@ -118,22 +119,9 @@ config SUSPEND
powered and thus its contents are preserved, such as the powered and thus its contents are preserved, such as the
suspend-to-RAM state (i.e. the ACPI S3 state). suspend-to-RAM state (i.e. the ACPI S3 state).
config HIBERNATION_UP_POSSIBLE
bool
depends on X86 || PPC64_SWSUSP || 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 config HIBERNATION
bool "Hibernation (aka 'suspend to disk')" bool "Hibernation (aka 'suspend to disk')"
depends on PM && SWAP depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
---help--- ---help---
Enable the suspend to disk (STD) functionality, which is usually Enable the suspend to disk (STD) functionality, which is usually
called "hibernation" in user interfaces. STD checkpoints the called "hibernation" in user interfaces. STD checkpoints the