Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-x86 into cpus4096

3 files changed, 4 insertions, 5 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index f8f578a71b25..40b809742a1c 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -24,7 +24,7 @@ static struct sysdev_class node_class = {
 static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)
 {
         struct node *node_dev = to_node(dev);
-        node_to_cpumask_ptr(mask, node_dev->sysdev.id);
+        const struct cpumask *mask = cpumask_of_node(node_dev->sysdev.id);
         int len;
 
         /* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 93eac1423585..b522f883d674 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -212,10 +212,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
         node = dev_to_node(&dev->dev);
         if (node >= 0) {
                 int cpu;
-                node_to_cpumask_ptr(nodecpumask, node);
 
                 get_online_cpus();
-                cpu = cpumask_any_and(nodecpumask, cpu_online_mask);
+                cpu = cpumask_any_and(cpumask_of_node(node), cpu_online_mask);
                 if (cpu < nr_cpu_ids)
                         error = work_on_cpu(cpu, local_pci_probe, &ddi);
                 else
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 974f56d1ebe1..5f54c01c1568 100644
--- 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 void vcpu_hotplug(unsigned int cpu)