aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-07-15 13:43:42 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-17 19:25:20 +0200
commit93a0886e2368eafb9df5e2021fb185195cee88b2 (patch)
tree5ba351bc94a9cd68bf6a7071603fe8f530485ec4
parent094029479be8eb380447f42eff1b35362ef1a464 (diff)
downloadmrst-s0i3-test-93a0886e2368eafb9df5e2021fb185195cee88b2.tar.gz
mrst-s0i3-test-93a0886e2368eafb9df5e2021fb185195cee88b2.tar.xz
mrst-s0i3-test-93a0886e2368eafb9df5e2021fb185195cee88b2.zip
x86, xen, power: fix up config dependencies on PM
Xen save/restore needs bits of code enabled by PM_SLEEP, and PM_SLEEP depends on PM. So make XEN_SAVE_RESTORE depend on PM and PM_SLEEP depend on XEN_SAVE_RESTORE. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/xen/Kconfig5
-rw-r--r--kernel/power/Kconfig2
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 20b49729bed..3815e425f47 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -23,3 +23,8 @@ config XEN_MAX_DOMAIN_MEMORY
according to the maximum possible memory size of a Xen
domain. This array uses 1 page per gigabyte, so there's no
need to be too stingy here.
+
+config XEN_SAVE_RESTORE
+ bool
+ depends on PM
+ default y \ No newline at end of file
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index b45da40e8d2..59dfdf1e1d2 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -82,7 +82,7 @@ config PM_SLEEP_SMP
config PM_SLEEP
bool
- depends on SUSPEND || HIBERNATION
+ depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
default y
config SUSPEND