Suspend: Clean up Kconfig (V2)

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

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Acked-by: Paul Mackerras <paulus@samba.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Paul Mundt <lethal@linux-sh.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:14:00 +01:00 committed by Len Brown
parent 801e4062fd
commit f4cb570076
8 changed files with 31 additions and 18 deletions

View File

@ -1035,6 +1035,9 @@ menu "Power management options"
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
def_bool y
endmenu
source "net/Kconfig"

View File

@ -898,6 +898,10 @@ endmenu
menu "Power management options"
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on !SMP
choice
prompt "Select PM Wakeup Event Source"
default PM_WAKEUP_GPIO_BY_SIC_IWR

View File

@ -357,6 +357,11 @@ source "drivers/pcmcia/Kconfig"
# should probably wait a while.
menu "Power management options"
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on !SMP
source kernel/power/Kconfig
endmenu

View File

@ -2086,6 +2086,10 @@ endmenu
menu "Power management options"
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on !SMP
source "kernel/power/Kconfig"
endmenu

View File

@ -166,6 +166,10 @@ config ARCH_HIBERNATION_POSSIBLE
depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32)
default y
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200
config PPC_DCR_NATIVE
bool
default n

View File

@ -882,6 +882,10 @@ endmenu
menu "Power management options (EXPERIMENTAL)"
depends on EXPERIMENTAL && SYS_SUPPORTS_PM
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on !SMP
source kernel/power/Kconfig
endmenu

View File

@ -116,6 +116,10 @@ config ARCH_HIBERNATION_POSSIBLE
def_bool y
depends on !SMP || !X86_VOYAGER
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on !X86_VOYAGER
config ZONE_DMA32
bool
default X86_64

View File

@ -85,7 +85,7 @@ config PM_TRACE_RTC
config PM_SLEEP_SMP
bool
depends on SMP
depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
select HOTPLUG_CPU
default y
@ -95,29 +95,14 @@ 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 SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
depends on PM && ARCH_SUSPEND_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).
suspend-to-RAM state (e.g. the ACPI S3 state).
config HIBERNATION
bool "Hibernation (aka 'suspend to disk')"