tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Johannes Berg and committed by
Len Brown f4cb5700 801e4062

+31 -18
+3
arch/arm/Kconfig
··· 1035 1035 1036 1036 source "kernel/power/Kconfig" 1037 1037 1038 + config ARCH_SUSPEND_POSSIBLE 1039 + def_bool y 1040 + 1038 1041 endmenu 1039 1042 1040 1043 source "net/Kconfig"
+4
arch/blackfin/Kconfig
··· 898 898 menu "Power management options" 899 899 source "kernel/power/Kconfig" 900 900 901 + config ARCH_SUSPEND_POSSIBLE 902 + def_bool y 903 + depends on !SMP 904 + 901 905 choice 902 906 prompt "Select PM Wakeup Event Source" 903 907 default PM_WAKEUP_GPIO_BY_SIC_IWR
+5
arch/frv/Kconfig
··· 357 357 # should probably wait a while. 358 358 359 359 menu "Power management options" 360 + 361 + config ARCH_SUSPEND_POSSIBLE 362 + def_bool y 363 + depends on !SMP 364 + 360 365 source kernel/power/Kconfig 361 366 endmenu 362 367
+4
arch/mips/Kconfig
··· 2086 2086 2087 2087 menu "Power management options" 2088 2088 2089 + config ARCH_SUSPEND_POSSIBLE 2090 + def_bool y 2091 + depends on !SMP 2092 + 2089 2093 source "kernel/power/Kconfig" 2090 2094 2091 2095 endmenu
+4
arch/powerpc/Kconfig
··· 166 166 depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32) 167 167 default y 168 168 169 + config ARCH_SUSPEND_POSSIBLE 170 + def_bool y 171 + depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 172 + 169 173 config PPC_DCR_NATIVE 170 174 bool 171 175 default n
+4
arch/sh/Kconfig
··· 882 882 menu "Power management options (EXPERIMENTAL)" 883 883 depends on EXPERIMENTAL && SYS_SUPPORTS_PM 884 884 885 + config ARCH_SUSPEND_POSSIBLE 886 + def_bool y 887 + depends on !SMP 888 + 885 889 source kernel/power/Kconfig 886 890 887 891 endmenu
+4
arch/x86/Kconfig
··· 116 116 def_bool y 117 117 depends on !SMP || !X86_VOYAGER 118 118 119 + config ARCH_SUSPEND_POSSIBLE 120 + def_bool y 121 + depends on !X86_VOYAGER 122 + 119 123 config ZONE_DMA32 120 124 bool 121 125 default X86_64
+3 -18
kernel/power/Kconfig
··· 85 85 config PM_SLEEP_SMP 86 86 bool 87 87 depends on SMP 88 - depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE 88 + depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE 89 89 depends on PM_SLEEP 90 90 select HOTPLUG_CPU 91 91 default y ··· 95 95 depends on SUSPEND || HIBERNATION 96 96 default y 97 97 98 - config SUSPEND_UP_POSSIBLE 99 - bool 100 - depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \ 101 - || SUPERH || FRV 102 - depends on !SMP 103 - default y 104 - 105 - config SUSPEND_SMP_POSSIBLE 106 - bool 107 - depends on (X86 && !X86_VOYAGER) \ 108 - || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM 109 - depends on SMP 110 - default y 111 - 112 98 config SUSPEND 113 99 bool "Suspend to RAM and standby" 114 - depends on PM 115 - depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE 100 + depends on PM && ARCH_SUSPEND_POSSIBLE 116 101 default y 117 102 ---help--- 118 103 Allow the system to enter sleep states in which main memory is 119 104 powered and thus its contents are preserved, such as the 120 - suspend-to-RAM state (i.e. the ACPI S3 state). 105 + suspend-to-RAM state (e.g. the ACPI S3 state). 121 106 122 107 config HIBERNATION 123 108 bool "Hibernation (aka 'suspend to disk')"