Cc: Rafael J. Wysocki <rjw@...>, <david@...>, Andrew Morton <akpm@...>, <linux-acpi@...>, <linux-kernel@...>, Pavel Machek <pavel@...>, Adrian Bunk <bunk@...>, Stefan Richter <stefanr@...>, Nigel Cunningham <nigel@...>, pm list <linux-pm@...>
From: Linus Torvalds <torvalds@linux-foundation.org>
Without this change, it is possible to build CONFIG_HIBERNATE
on all !SMP architectures, but not necessarily their SMP versions.
I don't know for sure if the architecture list under SUSPEND_UP_POSSIBLE
is correct. For now it simply matches the list for SUSPEND_SMP_POSSIBLE.
Signed-off-by: Len Brown <len.brown@intel.com>
---
Kconfig | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 412859f..ccf6576 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -72,6 +72,11 @@ 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_UP_POSSIBLE
+ bool
+ depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC))
+ default y
+
config SUSPEND_SMP_POSSIBLE
bool
depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC))
@@ -92,7 +97,7 @@ config PM_SLEEP
config SUSPEND
bool "Suspend to RAM and standby"
depends on PM
- depends on !SMP || SUSPEND_SMP_POSSIBLE
+ depends on (!SMP && SUSPEND_UP_POSSIBLE) || (SMP && SUSPEND_SMP_POSSIBLE)
default y
---help---
Allow the system to enter sleep states in which main memory is
-