diff --git a/[refs] b/[refs] index 02f82aa1e98d..92dc20fb3439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 393d81aa026e19b6ede6f5f11955c97ee62e5df5 +refs/heads/master: 55ca089e2579de90f048aca2a3030b8b2f864813 diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c index 2bb268e4ac56..a5bc91ae6ff6 100644 --- a/trunk/drivers/xen/manage.c +++ b/trunk/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(); @@ -114,7 +114,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();