diff options
| author |   Ian Campbell <Ian.Campbell@citrix.com> | 2009-03-25 17:46:42 +0000 |
|---|---|---|
| committer |   Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-30 09:25:35 -0700 |
| commit | 1e6fcf840e11ceff8a656a678c6e4b0560a98e08 (patch) | |
| tree | 009bd99a0d73822a3cae6584512124deda956020 | |
| parent | xen/mmu: weaken flush_tlb_other test (diff) | |
| download | linux-dev-1e6fcf840e11ceff8a656a678c6e4b0560a98e08.tar.xz linux-dev-1e6fcf840e11ceff8a656a678c6e4b0560a98e08.zip | |
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) 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; } |