Re: [PATCH] PM: Fix dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION
From: Rafael J. Wysocki <hidden>
Date: 2007-08-04 22:00:21
Also in:
lkml
On Saturday, 4 August 2007 11:48, Rafael J. Wysocki wrote:
On Saturday, 4 August 2007 05:45, Len Brown wrote:quoted
On Friday 03 August 2007 18:47, Rafael J. Wysocki wrote:quoted
On Saturday, 4 August 2007 00:01, Linus Torvalds wrote:quoted
On Fri, 3 Aug 2007, Rafael J. Wysocki wrote:[--snip--]quoted
quoted
+config SUSPEND_UP_POSSIBLE + bool + depends on BLACKFIN || MIPS || SUPERH || FRV || (PPC32 && PPC_MPC52xx)please include (X86 && !X86_VOYAGER) here -- else you'll disable SUSPEND from all X86 when built UP.Right. I think I should include everything that can do SMP suspend here. Updated patch is appended.
Well, unfortunately, the patch below is buggy, because I need to change CONFIG_SUSPEND_SMP into CONFIG_PM_SLEEP_SMP in some more places. I'll send an updated version in a new thread. Greetings, Rafael
quoted hunk
--- From: Rafael J. Wysocki <redacted> Dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION introduced by commit 296699de6bdc717189a331ab6bbe90e05c94db06 "Introduce CONFIG_SUSPEND for suspend-to-Ram and standby" are incorrect, as they don't cover the facts that (1) not all architectures support suspend and (2) SMP hibernation is only possible on X86 and PPC64 (if PPC64_SWSUSP is set). Signed-off-by: Rafael J. Wysocki <redacted> --- kernel/power/Kconfig | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) Index: linux-2.6/kernel/power/Kconfig ===================================================================--- linux-2.6.orig/kernel/power/Kconfig +++ linux-2.6/kernel/power/Kconfig@@ -72,15 +72,10 @@ config PM_TRACE CAUTION: this option will cause your machine's real-time clock to be set to an invalid time after a resume. -config SUSPEND_SMP_POSSIBLE - bool - depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC)) - depends on SMP - default y - -config SUSPEND_SMP +config PM_SLEEP_SMP bool - depends on SUSPEND_SMP_POSSIBLE && PM_SLEEP + depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE + depends on PM_SLEEP select HOTPLUG_CPU default y@@ -89,20 +84,47 @@ config PM_SLEEP depends on SUSPEND || HIBERNATION default y +config SUSPEND_UP_POSSIBLE + bool + depends on (X86 && !X86_VOYAGER) || (PPC32 && PPC_MPC52xx) \ + || (PPC64 && (PPC_PSERIES || PPC_PMAC)) || ARM || BLACKFIN \ + || MIPS || SUPERH || FRV + depends on !SMP + default y + +config SUSPEND_SMP_POSSIBLE + bool + depends on (X86 && !X86_VOYAGER) \ + || (PPC64 && (PPC_PSERIES || PPC_PMAC)) || ARM + depends on SMP + default y + config SUSPEND bool "Suspend to RAM and standby" depends on PM - depends on !SMP || SUSPEND_SMP_POSSIBLE + depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_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). +config HIBERNATION_UP_POSSIBLE + bool + depends on X86 || PPC64_SWSUSP || FRV || 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 ((X86 || PPC64_SWSUSP || FRV || PPC32) && !SMP) || SUSPEND_SMP_POSSIBLE + depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE ---help--- Enable the suspend to disk (STD) functionality, which is usually called "hibernation" in user interfaces. STD checkpoints the -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
-- "Premature optimization is the root of all evil." - Donald Knuth