cpumask: Use accessors code.: ia64

Impact: use new API

Use the accessors rather than frobbing bits directly.  Most of this is
in arch code I haven't even compiled, but is straightforward.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>

2 files changed, 8 insertions, 11 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c4f41aca107..2f19d91b0b8 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -886,7 +886,7 @@ __init void prefill_possible_map(void)
                 possible, max((possible - available_cpus), 0));
 
         for (i = 0; i < possible; i++)
-                cpu_set(i, cpu_possible_map);
+                set_cpu_possible(i, true);
 }
 
 int acpi_map_lsapic(acpi_handle handle, int *pcpu)
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 52290547c85..7700e23034b 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -581,14 +581,14 @@ smp_build_cpu_map (void)
 
         ia64_cpu_to_sapicid[0] = boot_cpu_id;
         cpus_clear(cpu_present_map);
-        cpu_set(0, cpu_present_map);
-        cpu_set(0, cpu_possible_map);
+        set_cpu_present(0, true);
+        set_cpu_possible(0, true);
         for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {
                 sapicid = smp_boot_data.cpu_phys_id[i];
                 if (sapicid == boot_cpu_id)
                         continue;
-                cpu_set(cpu, cpu_present_map);
-                cpu_set(cpu, cpu_possible_map);
+                set_cpu_present(cpu, true);
+                set_cpu_possible(cpu, true);
                 ia64_cpu_to_sapicid[cpu] = sapicid;
                 cpu++;
         }
@@ -626,12 +626,9 @@ smp_prepare_cpus (unsigned int max_cpus)
          */
         if (!max_cpus) {
                 printk(KERN_INFO "SMP mode deactivated.\n");
-                cpus_clear(cpu_online_map);
-                cpus_clear(cpu_present_map);
-                cpus_clear(cpu_possible_map);
-                cpu_set(0, cpu_online_map);
-                cpu_set(0, cpu_present_map);
-                cpu_set(0, cpu_possible_map);
+                init_cpu_online(cpumask_of(0));
+                init_cpu_present(cpumask_of(0));
+                init_cpu_possible(cpumask_of(0));
                 return;
         }
 }