[PATCH] xen: new power management driver calls

From: Thadeu Lima de Souza Cascardo
Date: Tue Jul 08 2008 - 16:13:48 EST


linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because
xen_suspend calls device_power_up and device_resume, which require a
parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.
---
drivers/xen/manage.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5b546e3..64c554e 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
gnttab_resume();
xen_mm_unpin_all();

- device_power_up();
+ device_power_up(PMSG_RESUME);

if (!*cancelled) {
xen_irq_resume();
@@ -112,7 +112,7 @@ static void do_suspend(void)
else
xenbus_suspend_cancel();

- device_resume();
+ device_resume(PMSG_RESUME);

/* Make sure timer events get retriggered on all CPUs */
clock_was_set();
--
1.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/