Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[firefly-linux-kernel-4.4.55.git] / arch / ia64 / kernel / numa.c

diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index d288cde9360666b510e65c9a2a24171edf35ac77..92c376279c6d53a1511ab4c95cc95231dffc2510 100644 (file)
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -39,7 +39,7 @@ void map_cpu_to_node(int cpu, int nid)
        }
        /* sanity check first */
        oldnid = cpu_to_node_map[cpu];
-       if (cpu_isset(cpu, node_to_cpu_mask[oldnid])) {
+       if (cpumask_test_cpu(cpu, &node_to_cpu_mask[oldnid])) {
                return; /* nothing to do */
        }
        /* we don't have cpu-driven node hot add yet...
@@ -47,16 +47,16 @@ void map_cpu_to_node(int cpu, int nid)
        if (!node_online(nid))
                nid = first_online_node;
        cpu_to_node_map[cpu] = nid;
-       cpu_set(cpu, node_to_cpu_mask[nid]);
+       cpumask_set_cpu(cpu, &node_to_cpu_mask[nid]);
        return;
 }
 
 void unmap_cpu_from_node(int cpu, int nid)
 {
-       WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));
+       WARN_ON(!cpumask_test_cpu(cpu, &node_to_cpu_mask[nid]));
        WARN_ON(cpu_to_node_map[cpu] != nid);
        cpu_to_node_map[cpu] = 0;
-       cpu_clear(cpu, node_to_cpu_mask[nid]);
+       cpumask_clear_cpu(cpu, &node_to_cpu_mask[nid]);
 }
 
 
@@ -71,7 +71,7 @@ void __init build_cpu_to_node_map(void)
        int cpu, i, node;
 
        for(node=0; node < MAX_NUMNODES; node++)
-               cpus_clear(node_to_cpu_mask[node]);
+               cpumask_clear(&node_to_cpu_mask[node]);
 
        for_each_possible_early_cpu(cpu) {
                node = -1;