From 0ac0bffe18f61f1221fb0890d3683b485e3729f5 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 15 Jul 2008 13:43:42 -0700 Subject: [PATCH] --- yaml --- r: 104459 b: refs/heads/master c: 93a0886e2368eafb9df5e2021fb185195cee88b2 h: refs/heads/master i: 104457: 3ec72643bcf77475cdbc086f2aa4791cc115550e 104455: 58efd34c4b4bada7f1a81713fbd9f814da7bad54 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/Kconfig | 5 +++++ trunk/kernel/power/Kconfig | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8770740ff3f7..d2157a0e9664 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 094029479be8eb380447f42eff1b35362ef1a464 +refs/heads/master: 93a0886e2368eafb9df5e2021fb185195cee88b2 diff --git a/trunk/arch/x86/xen/Kconfig b/trunk/arch/x86/xen/Kconfig index 20b49729bed5..3815e425f470 100644 --- a/trunk/arch/x86/xen/Kconfig +++ b/trunk/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/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index b45da40e8d25..59dfdf1e1d20 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/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