diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-07-15 13:43:42 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 19:25:20 +0200 |
| commit | 93a0886e2368eafb9df5e2021fb185195cee88b2 (patch) | |
| tree | 5ba351bc94a9cd68bf6a7071603fe8f530485ec4 | |
| parent | 094029479be8eb380447f42eff1b35362ef1a464 (diff) | |
| download | op-kernel-dev-93a0886e2368eafb9df5e2021fb185195cee88b2.zip op-kernel-dev-93a0886e2368eafb9df5e2021fb185195cee88b2.tar.gz | |
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/Kconfig | 5 | ||||
| -rw-r--r-- | kernel/power/Kconfig | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 20b4972..3815e42 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 b45da40..59dfdf1 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 |
