Make XEN_SAVE_RESTORE user visible and enable HIBERNATION and SWAP,
if this option is enabled.
Remove XEN_SAVE_RESTORE dependancy from PM_SLEEP.
Signed-off-by: Shriram Rajagopalan <rshriram@xxxxxxxxx>
---
arch/x86/xen/Kconfig | 6 ++++--
kernel/power/Kconfig | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 5b54892..ab6c3a2 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -37,8 +37,10 @@ config XEN_MAX_DOMAIN_MEMORY
portions of which are freed.
config XEN_SAVE_RESTORE
- bool
- depends on XEN && PM
+ bool "Enable Xen Guest save/restore/checkpoint"
+ depends on XEN
+ select SWAP
+ select HIBERNATION
default y
config XEN_DEBUG_FS
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 2657299..ccff0ba 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -92,7 +92,7 @@ config PM_SLEEP_SMP
config PM_SLEEP
bool
- depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
+ depends on SUSPEND || HIBERNATION
default y
config PM_SLEEP_ADVANCED_DEBUG
--
1.7.0.4
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
