Skip to contentSkip to conversation

xen: fix up config dependencies on PM

PATCH Superseded Jeremy Fitzhardinge 2 participants 2 messages Jul 10, 2008

Subsystems (4)
x86 Suspend to RAM Hibernation Xen hypervisor x86
lore
Share & tools
lore

Jeremy Fitzhardinge

author
#0 lore raw

PATCH 1/1 xen: 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 <[email protected]>

---

arch/x86/xen/Kconfig |    5 +++++
kernel/power/Kconfig |    2 +-
2 files changed, 6 insertions(+), 1 deletion(-)

===================================================================

arch/x86/xen/Kconfig +5 -0
@@ -23,3 +23,8 @@
         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

===================================================================

kernel/power/Kconfig +0 -0
@@ -82,7 +82,7 @@

config PM_SLEEP
bool

-	depends on SUSPEND || HIBERNATION
+	depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE

default y

config SUSPEND

Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Jeremy Fitzhardinge

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 <[email protected]>
Acked-by Rafael J. Wysocki <[email protected]>
Quoted 31 lines
---
 arch/x86/xen/Kconfig |    5 +++++
 kernel/power/Kconfig |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

===================================================================

arch/x86/xen/Kconfig +5 -0
@@ -23,3 +23,8 @@
          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

===================================================================

kernel/power/Kconfig +1 -1
@@ -82,7 +82,7 @@
 
 config PM_SLEEP
 	bool
-	depends on SUSPEND || HIBERNATION
+	depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
 	default y
 
 config SUSPEND