Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93a0886e authored Jul 15, 2008 by Jeremy Fitzhardinge Committed by Ingo Molnar Jul 17, 2008

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>

parent 09402947

arch/x86/xen/Kconfig

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,3 +23,8 @@ config XEN_MAX_DOMAIN_MEMORY
	according to the maximum possible memory size of a Xen		according to the maximum possible memory size of a Xen
	domain. This array uses 1 page per gigabyte, so there's no		domain. This array uses 1 page per gigabyte, so there's no
	need to be too stingy here.		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

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ config PM_SLEEP_SMP

	config PM_SLEEP		config PM_SLEEP
	bool		bool
	depends on SUSPEND \|\| HIBERNATION		depends on SUSPEND \|\| HIBERNATION \|\| XEN_SAVE_RESTORE
	default y		default y

	config SUSPEND		config SUSPEND