---

yaml --- r: 104459 b: refs/heads/master c: 93a0886 h: refs/heads/master i: 104457: 3ec7264 104455: 58efd34 v: v3
git-mirror · Jul 17, 2008 · 0ac0bff · 0ac0bff
1 parent eab9e80
commit 0ac0bff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
diff --git 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