X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fxen%2Fmanage.c;h=a5bc91ae6ff69f5d5d4b2e9f49e308acd9126b20;hb=9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6;hp=5b546e365f007d028843eea0ee84e77a0def1f58;hpb=e7849f16c13476288fe4fbd420975e8456c75aa0;p=linux-2.6

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5b546e365f..a5bc91ae6f 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -63,11 +63,12 @@ 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();
 		xen_console_resume();
+		xen_timer_resume();
 	}
 
 	return 0;
@@ -107,12 +108,13 @@ static void do_suspend(void)
 		goto out;
 	}
 
-	if (!cancelled)
+	if (!cancelled) {
+		xen_arch_resume();
 		xenbus_resume();
-	else
+	} else
 		xenbus_suspend_cancel();
 
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();