1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index bf1940706422..9e6a85104a20 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -131,6 +131,8 @@ static void do_suspend(void)
                 goto out_resume;
         }
 
+        xen_arch_suspend();
+
         si.cancelled = 1;
 
         err = stop_machine(xen_suspend, &si, cpumask_of(0));
@@ -148,11 +150,12 @@ static void do_suspend(void)
                 si.cancelled = 1;
         }
 
+        xen_arch_resume();
+
 out_resume:
-        if (!si.cancelled) {
-                xen_arch_resume();
+        if (!si.cancelled)
                 xs_resume();
-        } else
+        else
                 xs_suspend_cancel();
 
         dpm_resume_end(si.cancelled ? PMSG_THAW : PMSG_RESTORE);