Merge commit 'origin/master' into for-linus/xen/master

[karo-tx-linux.git] / drivers / xen / cpu_hotplug.c

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 411cb1fc92795b969ee3d3cf3f0d4ffdc7558e4c..bdfd584ad853ac379e0b3ed9975034e86faa27c4 100644 (file)
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -10,7 +10,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,7 +18,7 @@ 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 int vcpu_online(unsigned int cpu)