summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2009-03-25 20:46:42 +0300
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-30 20:25:35 +0400
commit1e6fcf840e11ceff8a656a678c6e4b0560a98e08 (patch)
tree009bd99a0d73822a3cae6584512124deda956020 /drivers/xen
parent8de07bbdede03598801cf33ab23dcbcd28a918d2 (diff)
downloadlinux-1e6fcf840e11ceff8a656a678c6e4b0560a98e08.tar.xz
xen: resume interrupts before system devices.
Impact: bugfix Xen domain restore Otherwise the first timer interrupt after resume is missed and we never get another. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/manage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 3ccd348d112d..b703dd2c9f11 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -68,15 +68,15 @@ static int xen_suspend(void *data)
gnttab_resume();
xen_mm_unpin_all();
- sysdev_resume();
- device_power_up(PMSG_RESUME);
-
if (!*cancelled) {
xen_irq_resume();
xen_console_resume();
xen_timer_resume();
}
+ sysdev_resume();
+ device_power_up(PMSG_RESUME);
+
return 0;
}