diff options
Diffstat (limited to 'drivers/xen/manage.c')
-rw-r--r-- | drivers/xen/manage.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 5b546e365f00..a5bc91ae6ff6 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
@@ -63,11 +63,12 @@ static int xen_suspend(void *data) | |||
63 | gnttab_resume(); | 63 | gnttab_resume(); |
64 | xen_mm_unpin_all(); | 64 | xen_mm_unpin_all(); |
65 | 65 | ||
66 | device_power_up(); | 66 | device_power_up(PMSG_RESUME); |
67 | 67 | ||
68 | if (!*cancelled) { | 68 | if (!*cancelled) { |
69 | xen_irq_resume(); | 69 | xen_irq_resume(); |
70 | xen_console_resume(); | 70 | xen_console_resume(); |
71 | xen_timer_resume(); | ||
71 | } | 72 | } |
72 | 73 | ||
73 | return 0; | 74 | return 0; |
@@ -107,12 +108,13 @@ static void do_suspend(void) | |||
107 | goto out; | 108 | goto out; |
108 | } | 109 | } |
109 | 110 | ||
110 | if (!cancelled) | 111 | if (!cancelled) { |
112 | xen_arch_resume(); | ||
111 | xenbus_resume(); | 113 | xenbus_resume(); |
112 | else | 114 | } else |
113 | xenbus_suspend_cancel(); | 115 | xenbus_suspend_cancel(); |
114 | 116 | ||
115 | device_resume(); | 117 | device_resume(PMSG_RESUME); |
116 | 118 | ||
117 | /* Make sure timer events get retriggered on all CPUs */ | 119 | /* Make sure timer events get retriggered on all CPUs */ |
118 | clock_was_set(); | 120 | clock_was_set(); |