Merge branch 'setns'

[karo-tx-linux.git] / arch / m32r / kernel / smpboot.c

diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index e034844cfc0d948095104ca874d8a9ca02135184..cfdbe5d15002070d1b9f84e3a26656184be5c16d 100644 (file)
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -135,9 +135,9 @@ void __devinit smp_prepare_boot_cpu(void)
 {
        bsp_phys_id = hard_smp_processor_id();
        physid_set(bsp_phys_id, phys_cpu_present_map);
-       cpu_set(0, cpu_online_map);     /* BSP's cpu_id == 0 */
-       cpu_set(0, cpu_callout_map);
-       cpu_set(0, cpu_callin_map);
+       set_cpu_online(0, true);        /* BSP's cpu_id == 0 */
+       cpumask_set_cpu(0, &cpu_callout_map);
+       cpumask_set_cpu(0, &cpu_callin_map);
 
        /*
         * Initialize the logical to physical CPU number mapping
@@ -178,7 +178,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
                physid_set(phys_id, phys_cpu_present_map);
 #ifndef CONFIG_HOTPLUG_CPU
-       init_cpu_present(&cpu_possible_map);
+       init_cpu_present(cpu_possible_mask);
 #endif
 
        show_mp_info(nr_cpu);
@@ -294,10 +294,10 @@ static void __init do_boot_cpu(int phys_id)
        send_status = 0;
        boot_status = 0;
 
-       cpu_set(phys_id, cpu_bootout_map);
+       cpumask_set_cpu(phys_id, &cpu_bootout_map);
 
        /* Send Startup IPI */
-       send_IPI_mask_phys(cpumask_of_cpu(phys_id), CPU_BOOT_IPI, 0);
+       send_IPI_mask_phys(cpumask_of(phys_id), CPU_BOOT_IPI, 0);
 
        Dprintk("Waiting for send to finish...\n");
        timeout = 0;
@@ -306,7 +306,7 @@ static void __init do_boot_cpu(int phys_id)
        do {
                Dprintk("+");
                udelay(1000);
-               send_status = !cpu_isset(phys_id, cpu_bootin_map);
+               send_status = !cpumask_test_cpu(phys_id, &cpu_bootin_map);
        } while (send_status && (timeout++ < 100));
 
        Dprintk("After Startup.\n");
@@ -316,19 +316,19 @@ static void __init do_boot_cpu(int phys_id)
                 * allow APs to start initializing.
                 */
                Dprintk("Before Callout %d.\n", cpu_id);
-               cpu_set(cpu_id, cpu_callout_map);
+               cpumask_set_cpu(cpu_id, &cpu_callout_map);
                Dprintk("After Callout %d.\n", cpu_id);
 
                /*
                 * Wait 5s total for a response
                 */
                for (timeout = 0; timeout < 5000; timeout++) {
-                       if (cpu_isset(cpu_id, cpu_callin_map))
+                       if (cpumask_test_cpu(cpu_id, &cpu_callin_map))
                                break;  /* It has booted */
                        udelay(1000);
                }
 
-               if (cpu_isset(cpu_id, cpu_callin_map)) {
+               if (cpumask_test_cpu(cpu_id, &cpu_callin_map)) {
                        /* number CPUs logically, starting from 1 (BSP is 0) */
                        Dprintk("OK.\n");
                } else {
@@ -340,9 +340,9 @@ static void __init do_boot_cpu(int phys_id)
 
        if (send_status || boot_status) {
                unmap_cpu_to_physid(cpu_id, phys_id);
-               cpu_clear(cpu_id, cpu_callout_map);
-               cpu_clear(cpu_id, cpu_callin_map);
-               cpu_clear(cpu_id, cpu_initialized);
+               cpumask_clear_cpu(cpu_id, &cpu_callout_map);
+               cpumask_clear_cpu(cpu_id, &cpu_callin_map);
+               cpumask_clear_cpu(cpu_id, &cpu_initialized);
                cpucount--;
        }
 }
@@ -351,17 +351,17 @@ int __cpuinit __cpu_up(unsigned int cpu_id)
 {
        int timeout;
 
-       cpu_set(cpu_id, smp_commenced_mask);
+       cpumask_set_cpu(cpu_id, &smp_commenced_mask);
 
        /*
         * Wait 5s total for a response
         */
        for (timeout = 0; timeout < 5000; timeout++) {
-               if (cpu_isset(cpu_id, cpu_online_map))
+               if (cpu_online(cpu_id))
                        break;
                udelay(1000);
        }
-       if (!cpu_isset(cpu_id, cpu_online_map))
+       if (!cpu_online(cpu_id))
                BUG();
 
        return 0;
@@ -373,11 +373,11 @@ void __init smp_cpus_done(unsigned int max_cpus)
        unsigned long bogosum = 0;
 
        for (timeout = 0; timeout < 5000; timeout++) {
-               if (cpus_equal(cpu_callin_map, cpu_online_map))
+               if (cpumask_equal(&cpu_callin_map, cpu_online_mask))
                        break;
                udelay(1000);
        }
-       if (!cpus_equal(cpu_callin_map, cpu_online_map))
+       if (!cpumask_equal(&cpu_callin_map, cpu_online_mask))
                BUG();
 
        for (cpu_id = 0 ; cpu_id < num_online_cpus() ; cpu_id++)
@@ -388,7 +388,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
         */
        Dprintk("Before bogomips.\n");
        if (cpucount) {
-               for_each_cpu_mask(cpu_id, cpu_online_map)
+               for_each_cpu(cpu_id,cpu_online_mask)
                        bogosum += cpu_data[cpu_id].loops_per_jiffy;
 
                printk(KERN_INFO "Total of %d processors activated " \
@@ -425,7 +425,7 @@ int __init start_secondary(void *unused)
        cpu_init();
        preempt_disable();
        smp_callin();
-       while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
+       while (!cpumask_test_cpu(smp_processor_id(), &smp_commenced_mask))
                cpu_relax();
 
        smp_online();
@@ -463,7 +463,7 @@ static void __init smp_callin(void)
        int cpu_id = smp_processor_id();
        unsigned long timeout;
 
-       if (cpu_isset(cpu_id, cpu_callin_map)) {
+       if (cpumask_test_cpu(cpu_id, &cpu_callin_map)) {
                printk("huh, phys CPU#%d, CPU#%d already present??\n",
                        phys_id, cpu_id);
                BUG();
@@ -474,7 +474,7 @@ static void __init smp_callin(void)
        timeout = jiffies + (2 * HZ);
        while (time_before(jiffies, timeout)) {
                /* Has the boot CPU finished it's STARTUP sequence ? */
-               if (cpu_isset(cpu_id, cpu_callout_map))
+               if (cpumask_test_cpu(cpu_id, &cpu_callout_map))
                        break;
                cpu_relax();
        }
@@ -486,7 +486,7 @@ static void __init smp_callin(void)
        }
 
        /* Allow the master to continue. */
-       cpu_set(cpu_id, cpu_callin_map);
+       cpumask_set_cpu(cpu_id, &cpu_callin_map);
 }
 
 static void __init smp_online(void)
@@ -503,7 +503,7 @@ static void __init smp_online(void)
        /* Save our processor parameters */
        smp_store_cpu_info(cpu_id);
 
-       cpu_set(cpu_id, cpu_online_map);
+       set_cpu_online(cpu_id, true);
 }
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/