Commit 801e4062 authored by Johannes Berg's avatar Johannes Berg Committed by Len Brown
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 23976728

arch/powerpc/Kconfig

+12 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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

kernel/power/Kconfig

+3 −15
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ config PM_TRACE_RTC 


config PM_SLEEP_SMP

	bool

	depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE

	depends on SMP

	depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE

	depends on PM_SLEEP

	select HOTPLUG_CPU

	default y
@@ -118,22 +119,9 @@ config SUSPEND 
	  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 || 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 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE