2 files changed, 13 insertions, 11 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index ebb292859b59..95143dd6904d 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -61,7 +61,7 @@ static void xen_post_suspend(int cancelled)
         xen_mm_unpin_all();
 }
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_HIBERNATION
 static int xen_suspend(void *data)
 {
         struct suspend_info *si = data;
@@ -69,7 +69,7 @@ static int xen_suspend(void *data)
 
         BUG_ON(!irqs_disabled());
 
-        err = sysdev_suspend(PMSG_SUSPEND);
+        err = sysdev_suspend(PMSG_FREEZE);
         if (err) {
                 printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
                         err);
@@ -118,7 +118,7 @@ static void do_suspend(void)
         }
 #endif
 
-        err = dpm_suspend_start(PMSG_SUSPEND);
+        err = dpm_suspend_start(PMSG_FREEZE);
         if (err) {
                 printk(KERN_ERR "xen suspend: dpm_suspend_start %d\n", err);
                 goto out_thaw;
@@ -127,7 +127,7 @@ static void do_suspend(void)
         printk(KERN_DEBUG "suspending xenstore...\n");
         xs_suspend();
 
-        err = dpm_suspend_noirq(PMSG_SUSPEND);
+        err = dpm_suspend_noirq(PMSG_FREEZE);
         if (err) {
                 printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
                 goto out_resume;
@@ -147,7 +147,7 @@ static void do_suspend(void)
 
         err = stop_machine(xen_suspend, &si, cpumask_of(0));
 
-        dpm_resume_noirq(PMSG_RESUME);
+        dpm_resume_noirq(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
 
         if (err) {
                 printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
@@ -161,7 +161,7 @@ out_resume:
         } else
                 xs_suspend_cancel();
 
-        dpm_resume_end(PMSG_RESUME);
+        dpm_resume_end(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
 
         /* Make sure timer events get retriggered on all CPUs */
         clock_was_set();
@@ -173,7 +173,7 @@ out:
 #endif
         shutting_down = SHUTDOWN_INVALID;
 }
-#endif  /* CONFIG_PM_SLEEP */
+#endif  /* CONFIG_HIBERNATION */
 
 struct shutdown_handler {
         const char *command;
@@ -202,7 +202,7 @@ static void shutdown_handler(struct xenbus_watch *watch,
                 { "poweroff",   do_poweroff },
                 { "halt",       do_poweroff },
                 { "reboot",     do_reboot   },
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_HIBERNATION
                 { "suspend",    do_suspend  },
 #endif
                 {NULL, NULL},
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index ea83999c02f3..b6a2690c9d49 100644
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -86,9 +86,11 @@ static struct device_attribute xenbus_frontend_dev_attrs[] = {
 };
 
 static const struct dev_pm_ops xenbus_pm_ops = {
-        .suspend = xenbus_dev_suspend,
-        .resume  = xenbus_dev_resume,
-        .thaw  = xenbus_dev_cancel,
+        .suspend        = xenbus_dev_suspend,
+        .resume         = xenbus_dev_resume,
+        .freeze         = xenbus_dev_suspend,
+        .thaw           = xenbus_dev_cancel,
+        .restore        = xenbus_dev_resume,
 };
 
 static struct xen_bus_type xenbus_frontend = {