3 files changed, 35 insertions, 13 deletions

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index efa4b363ce72..f5bbd9e83416 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -513,7 +513,8 @@ static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr
                               char *buf)
 {
         return sprintf(buf, "%llu\n",
-                       (u64)balloon_stats.target_pages << PAGE_SHIFT);
+                       (unsigned long long)balloon_stats.target_pages
+                       << PAGE_SHIFT);
 }
 
 static ssize_t store_target(struct sys_device *dev,
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 5f54c01c1568..bdfd584ad853 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -21,29 +21,41 @@ static void disable_hotplug_cpu(int cpu)
         set_cpu_present(cpu, false);
 }
 
-static void vcpu_hotplug(unsigned int cpu)
+static int vcpu_online(unsigned int cpu)
 {
         int err;
         char dir[32], state[32];
 
-        if (!cpu_possible(cpu))
-                return;
-
         sprintf(dir, "cpu/%u", cpu);
         err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
         if (err != 1) {
                 printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
-                return;
+                return err;
         }
 
-        if (strcmp(state, "online") == 0) {
+        if (strcmp(state, "online") == 0)
+                return 1;
+        else if (strcmp(state, "offline") == 0)
+                return 0;
+
+        printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n", state, cpu);
+        return -EINVAL;
+}
+static void vcpu_hotplug(unsigned int cpu)
+{
+        if (!cpu_possible(cpu))
+                return;
+
+        switch (vcpu_online(cpu)) {
+        case 1:
                 enable_hotplug_cpu(cpu);
-        } else if (strcmp(state, "offline") == 0) {
+                break;
+        case 0:
                 (void)cpu_down(cpu);
                 disable_hotplug_cpu(cpu);
-        } else {
-                printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n",
-                       state, cpu);
+                break;
+        default:
+                break;
         }
 }
 
@@ -64,12 +76,20 @@ static void handle_vcpu_hotplug_event(struct xenbus_watch *watch,
 static int setup_cpu_watcher(struct notifier_block *notifier,
                               unsigned long event, void *data)
 {
+        int cpu;
         static struct xenbus_watch cpu_watch = {
                 .node = "cpu",
                 .callback = handle_vcpu_hotplug_event};
 
         (void)register_xenbus_watch(&cpu_watch);
 
+        for_each_possible_cpu(cpu) {
+                if (vcpu_online(cpu) == 0) {
+                        (void)cpu_down(cpu);
+                        cpu_clear(cpu, cpu_present_map);
+                }
+        }
+
         return NOTIFY_DONE;
 }
 
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 0d61db1e7b49..4b5b84837ee1 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -62,14 +62,15 @@ static int xen_suspend(void *data)
         gnttab_resume();
         xen_mm_unpin_all();
 
-        sysdev_resume();
-
         if (!*cancelled) {
                 xen_irq_resume();
                 xen_console_resume();
                 xen_timer_resume();
         }
 
+        sysdev_resume();
+        device_power_up(PMSG_RESUME);
+
         return 0;
 }