sh: Fix CONFIG_PMB=n build.

[safe/jmp/linux-2.6] / drivers / xen / cpu_hotplug.c

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 565280e..14e2d99 100644 (file)
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -1,8 +1,9 @@
 #include <linux/notifier.h>
 
+#include <xen/xen.h>
 #include <xen/xenbus.h>
 
-#include <asm-x86/xen/hypervisor.h>
+#include <asm/xen/hypervisor.h>
 #include <asm/cpu.h>
 
 static void enable_hotplug_cpu(int cpu)
@@ -10,7 +11,7 @@ static void enable_hotplug_cpu(int cpu)
        if (!cpu_present(cpu))
                arch_register_cpu(cpu);
 
-       cpu_set(cpu, cpu_present_map);
+       set_cpu_present(cpu, true);
 }
 
 static void disable_hotplug_cpu(int cpu)
@@ -18,32 +19,44 @@ static void disable_hotplug_cpu(int cpu)
        if (cpu_present(cpu))
                arch_unregister_cpu(cpu);
 
-       cpu_clear(cpu, cpu_present_map);
+       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 +77,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);
+                       set_cpu_present(cpu, false);
+               }
+       }
+
        return NOTIFY_DONE;
 }