diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2009-03-25 13:46:42 -0400 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-30 12:25:35 -0400 |
commit | 1e6fcf840e11ceff8a656a678c6e4b0560a98e08 (patch) | |
tree | 009bd99a0d73822a3cae6584512124deda956020 | |
parent | 8de07bbdede03598801cf33ab23dcbcd28a918d2 (diff) |
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>
-rw-r--r-- | drivers/xen/manage.c | 6 |
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) | |||
68 | gnttab_resume(); | 68 | gnttab_resume(); |
69 | xen_mm_unpin_all(); | 69 | xen_mm_unpin_all(); |
70 | 70 | ||
71 | sysdev_resume(); | ||
72 | device_power_up(PMSG_RESUME); | ||
73 | |||
74 | if (!*cancelled) { | 71 | if (!*cancelled) { |
75 | xen_irq_resume(); | 72 | xen_irq_resume(); |
76 | xen_console_resume(); | 73 | xen_console_resume(); |
77 | xen_timer_resume(); | 74 | xen_timer_resume(); |
78 | } | 75 | } |
79 | 76 | ||
77 | sysdev_resume(); | ||
78 | device_power_up(PMSG_RESUME); | ||
79 | |||
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
82 | 82 | ||