eliminate cpu_set()

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/ia64/linux-xen/acpi.c b/xen/arch/ia64/linux-xen/acpi.c
index c9ec755724b1bc917ca17c79f4053451f67fe89c..9e359b12db40832cf7aadb610b68790028efdf4d 100644 (file)
--- a/xen/arch/ia64/linux-xen/acpi.c
+++ b/xen/arch/ia64/linux-xen/acpi.c
@@ -557,7 +557,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
            (pa->apic_id << 8) | (pa->local_sapic_eid);
        /* nid should be overridden as logical node id later */
        node_cpuid[srat_num_cpus].nid = pxm;
-       cpu_set(srat_num_cpus, early_cpu_possible_map);
+       cpumask_set_cpu(srat_num_cpus, &early_cpu_possible_map);
        srat_num_cpus++;
 }
 
@@ -917,7 +917,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);
+               cpumask_set_cpu(i, &cpu_possible_map);
 }
 
 #ifndef XEN

diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c
index 24169e46a227235056a844038a692a44a8aba9cb..e502d447572b619bf545ee54eeaefe1c43b81714 100644 (file)
--- a/xen/arch/ia64/linux-xen/setup.c
+++ b/xen/arch/ia64/linux-xen/setup.c
@@ -463,7 +463,7 @@ mark_bsp_online (void)
 {
 #ifdef CONFIG_SMP
        /* If we register an early console, allow CPU 0 to printk */
-       cpu_set(smp_processor_id(), cpu_online_map);
+       cpumask_set_cpu(smp_processor_id(), &cpu_online_map);
 #endif
 }
 

diff --git a/xen/arch/ia64/linux-xen/smpboot.c b/xen/arch/ia64/linux-xen/smpboot.c
index 09fd0ebacbac7f283ec01b06d4e996b2f2e3f13a..bd48a33bc7714a8303245200df59fd41e42bff28 100644 (file)
--- a/xen/arch/ia64/linux-xen/smpboot.c
+++ b/xen/arch/ia64/linux-xen/smpboot.c
@@ -392,7 +392,7 @@ smp_callin (void)
 #else
        lock_ipi_calllock();
 #endif
-       cpu_set(cpuid, cpu_online_map);
+       cpumask_set_cpu(cpuid, &cpu_online_map);
 #ifdef XEN
        unlock_ipi_calllock(flags);
 #else
@@ -437,7 +437,7 @@ smp_callin (void)
        /*
         * Allow the master to continue.
         */
-       cpu_set(cpuid, cpu_callin_map);
+       cpumask_set_cpu(cpuid, &cpu_callin_map);
        Dprintk("Stack on CPU %d at about %p\n",cpuid, &cpuid);
 }
 
@@ -625,8 +625,8 @@ smp_prepare_cpus (unsigned int max_cpus)
        /*
         * We have the boot CPU online for sure.
         */
-       cpu_set(0, cpu_online_map);
-       cpu_set(0, cpu_callin_map);
+       cpumask_set_cpu(0, &cpu_online_map);
+       cpumask_set_cpu(0, &cpu_callin_map);
 
        local_cpu_data->loops_per_jiffy = loops_per_jiffy;
        ia64_cpu_to_sapicid[0] = boot_cpu_id;
@@ -652,8 +652,8 @@ smp_prepare_cpus (unsigned int max_cpus)
 
 void __devinit smp_prepare_boot_cpu(void)
 {
-       cpu_set(smp_processor_id(), cpu_online_map);
-       cpu_set(smp_processor_id(), cpu_callin_map);
+       cpumask_set_cpu(smp_processor_id(), &cpu_online_map);
+       cpumask_set_cpu(smp_processor_id(), &cpu_callin_map);
        per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
 }
 

diff --git a/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c b/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c
index 7734aefa6736b2305d53af0a5b375bca6cefff8f..f79af883941f5be81a6f4a5cc94eee1bcf4dd4fd 100644 (file)
--- a/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c
+++ b/xen/arch/ia64/linux-xen/sn/kernel/sn2_smp.c
@@ -214,7 +214,7 @@ sn2_global_tlb_purge(unsigned long start,
        for_each_possible_cpu(cpu) {
                cnode = cpu_to_node(cpu);
                if (!node_isset(cnode, nodes_flushed)) {
-                       cpu_set(cpu, selected_cpus);
+                       cpumask_set_cpu(cpu, &selected_cpus);
                        i++;
                }
                node_set(cnode, nodes_flushed);

diff --git a/xen/arch/ia64/xen/mm_init.c b/xen/arch/ia64/xen/mm_init.c
index 8904873896f6bd3887f10ba184151e96d5746b54..ef6f2bfb583911ee36a75cad89ab84c0ee06f54f 100644 (file)
--- a/xen/arch/ia64/xen/mm_init.c
+++ b/xen/arch/ia64/xen/mm_init.c
@@ -38,7 +38,7 @@ ia64_mmu_init (void *my_cpu_data)
        ia64_set_psr(psr);
        ia64_srlz_i();
 #ifdef XEN
-       cpu_set(cpu, percpu_set);
+       cpumask_set_cpu(cpu, &percpu_set);
 #endif
 
        /*

diff --git a/xen/arch/ia64/xen/tlb_track.c b/xen/arch/ia64/xen/tlb_track.c
index 55c11885e6e8536de1f7f5e96e947a140c7a5ffa..dd7e40763518a19746c597b6b46fd2570937b167 100644 (file)
--- a/xen/arch/ia64/xen/tlb_track.c
+++ b/xen/arch/ia64/xen/tlb_track.c
@@ -389,7 +389,7 @@ tlb_track_insert_or_dirty(struct tlb_track* tlb_track, struct mm_struct* mm,
 
  found:
     BUG_ON(v->processor >= NR_CPUS);
-    cpu_set(v->processor, entry->pcpu_dirty_mask);
+    cpumask_set_cpu(v->processor, &entry->pcpu_dirty_mask);
     BUG_ON(v->vcpu_id >= NR_CPUS);
     vcpu_set(v->vcpu_id, entry->vcpu_dirty_mask);
     perfc_incr(tlb_track_iod_dirtied);

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index c4191b5c77aacacc04ff7649c880bb9cfa2ea6c3..805cd13053bfb7b073b041b76658ba00207e62fe 100644 (file)
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -271,9 +271,9 @@ static void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
      */
     if ( expires > NOW() || expires == 0 )
     {
-        cpu_set(cpu, cpuidle_mwait_flags);
+        cpumask_set_cpu(cpu, &cpuidle_mwait_flags);
         __mwait(eax, ecx);
-        cpu_clear(cpu, cpuidle_mwait_flags);
+        cpumask_clear_cpu(cpu, &cpuidle_mwait_flags);
     }
 
     if ( expires <= NOW() && expires > 0 )

diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c
index af112ce72aaa8da92fffb2ba510a21831c68f783..f9e3146dae270c961b0eeb18ac547a35a5ea73cc 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -828,7 +828,7 @@ static void intel_machine_check(struct cpu_user_regs * regs, long error_code)
              * (the MSRs are sticky)
              */
             if (bs.pcc || !bs.recoverable)
-                cpu_set(smp_processor_id(), mce_fatal_cpus);
+                cpumask_set_cpu(smp_processor_id(), &mce_fatal_cpus);
         } else {
             if (mctc != NULL)
                 mctelem_commit(mctc);
@@ -849,7 +849,7 @@ static void intel_machine_check(struct cpu_user_regs * regs, long error_code)
 
     mce_barrier_enter(&mce_trap_bar);
     if ( mctc != NULL && mce_urgent_action(regs, mctc))
-        cpu_set(smp_processor_id(), mce_fatal_cpus);
+        cpumask_set_cpu(smp_processor_id(), &mce_fatal_cpus);
     mce_barrier_exit(&mce_trap_bar);
     /*
      * Wait until everybody has processed the trap.

diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index d348fef93c60607ea07bb568dc57bee528b030b4..75a608b46814c99d1fae30e1bb9e3758ee836dd1 100644 (file)
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -161,7 +161,7 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m,
                        return cpu;
                }
                x86_cpu_to_apicid[cpu] = apicid;
-               cpu_set(cpu, cpu_present_map);
+               cpumask_set_cpu(cpu, &cpu_present_map);
        }
 
        if (++num_processors > 8) {

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 83e9ee38bccbaa8d17d2cd4f838e3282a5e7af87..0b869b3f36ea0df9441e13ea38bed58d715b3cf3 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -288,7 +288,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
 
 __cpuinit void numa_add_cpu(int cpu)
 {
-       cpu_set(cpu, node_to_cpumask[cpu_to_node(cpu)]);
+       cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
 } 
 
 void __cpuinit numa_set_node(int cpu, int node)

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 855e6216f15ef560cb1350d532b4e1084aaab3d2..1bd1db039d9c33cbfa28a6347c81a2a5649331a9 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -244,7 +244,7 @@ static void set_cpu_sibling_map(int cpu)
     int i;
     struct cpuinfo_x86 *c = cpu_data;
 
-    cpu_set(cpu, cpu_sibling_setup_map);
+    cpumask_set_cpu(cpu, &cpu_sibling_setup_map);
 
     if ( c[cpu].x86_num_siblings > 1 )
     {
@@ -380,7 +380,7 @@ void start_secondary(void *unused)
      */
     lock_vector_lock();
     __setup_vector_irq(cpu);
-    cpu_set(cpu, cpu_online_map);
+    cpumask_set_cpu(cpu, &cpu_online_map);
     unlock_vector_lock();
 
     init_percpu_time();
@@ -804,8 +804,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
 void __init smp_prepare_boot_cpu(void)
 {
-    cpu_set(smp_processor_id(), cpu_online_map);
-    cpu_set(smp_processor_id(), cpu_present_map);
+    cpumask_set_cpu(smp_processor_id(), &cpu_online_map);
+    cpumask_set_cpu(smp_processor_id(), &cpu_present_map);
 }
 
 static void
@@ -933,7 +933,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm)
                    "break assumed cross-CPU TSC coherency.\n"
                    " ** Consider using boot parameter \"tsc=skewed\" "
                    "which forces TSC emulation where appropriate.\n", cpu);
-        cpu_set(cpu, tsc_sync_cpu_mask);
+        cpumask_set_cpu(cpu, &tsc_sync_cpu_mask);
     }
 
     srat_detect_node(cpu);

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 1996890e3c531bcc8945d090c93c887bf3d3c2ff..690fa41cb8929d09ff2e9833140235e5cf9e7e2f 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1573,7 +1573,7 @@ __initcall(disable_pit_irq);
 
 void pit_broadcast_enter(void)
 {
-    cpu_set(smp_processor_id(), pit_broadcast_mask);
+    cpumask_set_cpu(smp_processor_id(), &pit_broadcast_mask);
 }
 
 void pit_broadcast_exit(void)

diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c
index 781f667658972011bcd8fcc5fa23cb568257106b..c3f87b77f0f526387619956da4e6a9a656742dd4 100644 (file)
--- a/xen/common/cpupool.c
+++ b/xen/common/cpupool.c
@@ -253,7 +253,7 @@ static long cpupool_unassign_cpu_helper(void *info)
 
     spin_lock(&cpupool_lock);
     ret = cpu_disable_scheduler(cpu);
-    cpu_set(cpu, cpupool_free_cpus);
+    cpumask_set_cpu(cpu, &cpupool_free_cpus);
     if ( !ret )
     {
         ret = schedule_cpu_switch(cpu, NULL);
@@ -409,8 +409,8 @@ void cpupool_rm_domain(struct domain *d)
 static void cpupool_cpu_add(unsigned int cpu)
 {
     spin_lock(&cpupool_lock);
-    cpu_clear(cpu, cpupool_locked_cpus);
-    cpu_set(cpu, cpupool_free_cpus);
+    cpumask_clear_cpu(cpu, &cpupool_locked_cpus);
+    cpumask_set_cpu(cpu, &cpupool_free_cpus);
     cpupool_assign_cpu_locked(cpupool0, cpu);
     spin_unlock(&cpupool_lock);
 }
@@ -428,7 +428,7 @@ static int cpupool_cpu_remove(unsigned int cpu)
     if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid))
         ret = -EBUSY;
     else
-        cpu_set(cpu, cpupool_locked_cpus);
+        cpumask_set_cpu(cpu, &cpupool_locked_cpus);
     spin_unlock(&cpupool_lock);
 
     return ret;

diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index a933535570d6e74a09b20ab945c2c66bc53958d0..2611e12f08e304cb45b9ea38df9a8fa4b48561ec 100644 (file)
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -1725,7 +1725,7 @@ csched_schedule(
     {
         /* Update the idle mask if necessary */
         if ( !cpumask_test_cpu(cpu, &rqd->idle) )
-            cpu_set(cpu, rqd->idle);
+            cpumask_set_cpu(cpu, &rqd->idle);
         /* Make sure avgload gets updated periodically even
          * if there's no activity */
         update_load(ops, rqd, NULL, 0, now);
@@ -1860,7 +1860,7 @@ static void activate_runqueue(struct csched_private *prv, int rqi)
     INIT_LIST_HEAD(&rqd->runq);
     spin_lock_init(&rqd->lock);
 
-    cpu_set(rqi, prv->active_queues);
+    cpumask_set_cpu(rqi, &prv->active_queues);
 }
 
 static void deactivate_runqueue(struct csched_private *prv, int rqi)
@@ -1927,12 +1927,12 @@ static void init_pcpu(const struct scheduler *ops, int cpu)
     /* Set the runqueue map */
     prv->runq_map[cpu]=rqi;
     
-    cpu_set(cpu, rqd->idle);
-    cpu_set(cpu, rqd->active);
+    cpumask_set_cpu(cpu, &rqd->idle);
+    cpumask_set_cpu(cpu, &rqd->active);
 
     spin_unlock(old_lock);
 
-    cpu_set(cpu, prv->initialized);
+    cpumask_set_cpu(cpu, &prv->initialized);
 
     spin_unlock_irqrestore(&prv->lock, flags);
 

diff --git a/xen/include/asm-ia64/linux-xen/asm/acpi.h b/xen/include/asm-ia64/linux-xen/asm/acpi.h
index a4996ba4c2c8562b9565c8d11ae2080182123220..60067149c98318c180942ca2aecaa75f5218aed4 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/acpi.h
+++ b/xen/include/asm-ia64/linux-xen/asm/acpi.h
@@ -153,7 +153,7 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus)
        high_cpu = min(high_cpu + reserve_cpus, NR_CPUS);
 
        for (cpu = low_cpu; cpu < high_cpu; cpu++) {
-               cpu_set(cpu, early_cpu_possible_map);
+               cpumask_set_cpu(cpu, &early_cpu_possible_map);
                if (node_cpuid[cpu].nid == NUMA_NO_NODE) {
                        node_cpuid[cpu].nid = next_nid;
                        next_nid++;

diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
index 4aa8933e09039d1b063de29024126ef8eb765e4f..52e43838ba06d4dc590783711e66395b4fe21746 100644 (file)
--- a/xen/include/xen/cpumask.h
+++ b/xen/include/xen/cpumask.h
@@ -97,7 +97,6 @@ static inline unsigned int cpumask_check(unsigned int cpu)
        return cpu;
 }
 
-#define cpu_set(cpu, dst) cpumask_set_cpu(cpu, &(dst))
 static inline void cpumask_set_cpu(int cpu, volatile cpumask_t *dstp)
 {
        set_bit(cpumask_check(cpu), dstp->bits);