15 files changed, 57 insertions, 56 deletions

diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index b6bb92c16a47..41dd00884975 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -157,7 +157,7 @@ static void octeon_dma_sync_sg_for_device(struct device *dev,
 }
 
 static void *octeon_dma_alloc_coherent(struct device *dev, size_t size,
-        dma_addr_t *dma_handle, gfp_t gfp)
+        dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
 {
         void *ret;
 
@@ -192,7 +192,7 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size,
 }
 
 static void octeon_dma_free_coherent(struct device *dev, size_t size,
-        void *vaddr, dma_addr_t dma_handle)
+        void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
         int order = get_order(size);
 
@@ -240,8 +240,8 @@ EXPORT_SYMBOL(dma_to_phys);
 
 static struct octeon_dma_map_ops octeon_linear_dma_map_ops = {
         .dma_map_ops = {
-                .alloc_coherent = octeon_dma_alloc_coherent,
-                .free_coherent = octeon_dma_free_coherent,
+                .alloc = octeon_dma_alloc_coherent,
+                .free = octeon_dma_free_coherent,
                 .map_page = octeon_dma_map_page,
                 .unmap_page = swiotlb_unmap_page,
                 .map_sg = octeon_dma_map_sg,
@@ -325,8 +325,8 @@ void __init plat_swiotlb_setup(void)
 #ifdef CONFIG_PCI
 static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = {
         .dma_map_ops = {
-                .alloc_coherent = octeon_dma_alloc_coherent,
-                .free_coherent = octeon_dma_free_coherent,
+                .alloc = octeon_dma_alloc_coherent,
+                .free = octeon_dma_free_coherent,
                 .map_page = octeon_dma_map_page,
                 .unmap_page = swiotlb_unmap_page,
                 .map_sg = octeon_dma_map_sg,
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index c3e2b85c3b02..97e7ce9b50ed 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -78,7 +78,7 @@ static inline void octeon_send_ipi_mask(const struct cpumask *mask,
 }
 
 /**
- * Detect available CPUs, populate cpu_possible_map
+ * Detect available CPUs, populate cpu_possible_mask
  */
 static void octeon_smp_hotplug_setup(void)
 {
@@ -268,7 +268,7 @@ static int octeon_cpu_disable(void)
 
         spin_lock(&smp_reserve_lock);
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
         cpu_clear(cpu, cpu_callin_map);
         local_irq_disable();
         fixup_irqs();
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 7aa37ddfca4b..be39a12901c6 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -57,25 +57,31 @@ dma_set_mask(struct device *dev, u64 mask)
 extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction);
 
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                                       dma_addr_t *dma_handle, gfp_t gfp)
+#define dma_alloc_coherent(d,s,h,f)     dma_alloc_attrs(d,s,h,f,NULL)
+
+static inline void *dma_alloc_attrs(struct device *dev, size_t size,
+                                    dma_addr_t *dma_handle, gfp_t gfp,
+                                    struct dma_attrs *attrs)
 {
         void *ret;
         struct dma_map_ops *ops = get_dma_ops(dev);
 
-        ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
+        ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
 
         debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
 
         return ret;
 }
 
-static inline void dma_free_coherent(struct device *dev, size_t size,
-                                     void *vaddr, dma_addr_t dma_handle)
+#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
+
+static inline void dma_free_attrs(struct device *dev, size_t size,
+                                  void *vaddr, dma_addr_t dma_handle,
+                                  struct dma_attrs *attrs)
 {
         struct dma_map_ops *ops = get_dma_ops(dev);
 
-        ops->free_coherent(dev, size, vaddr, dma_handle);
+        ops->free(dev, size, vaddr, dma_handle, attrs);
 
         debug_dma_free_coherent(dev, size, vaddr, dma_handle);
 }
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index 802e6160f37e..33f63bab478a 100644
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -173,7 +173,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
         if (retval)
                 goto out_unlock;
 
-        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
+        cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask);
 
 out_unlock:
         read_unlock(&tasklist_lock);
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index e309665b6c81..f8b2c592514d 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -25,7 +25,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         int i;
 
 #ifdef CONFIG_SMP
-        if (!cpu_isset(n, cpu_online_map))
+        if (!cpu_online(n))
                 return 0;
 #endif
 
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index ca673569fd24..3046e2986006 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -317,7 +317,7 @@ static int bmips_cpu_disable(void)
 
         pr_info("SMP: CPU%d is offline\n", cpu);
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
         cpu_clear(cpu, cpu_callin_map);
 
         local_flush_tlb_all();
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 9c1cce9de35f..ba9376bf52a1 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -148,7 +148,7 @@ static void stop_this_cpu(void *dummy)
         /*
          * Remove this CPU:
          */
-        cpu_clear(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), false);
         for (;;) {
                 if (cpu_wait)
                         (*cpu_wait)();          /* Wait if available. */
@@ -174,7 +174,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         mp_ops->prepare_cpus(max_cpus);
         set_cpu_sibling_map(0);
 #ifndef CONFIG_HOTPLUG_CPU
-        init_cpu_present(&cpu_possible_map);
+        init_cpu_present(cpu_possible_mask);
 #endif
 }
 
@@ -248,7 +248,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
         while (!cpu_isset(cpu, cpu_callin_map))
                 udelay(100);
 
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
 
         return 0;
 }
@@ -320,13 +320,12 @@ void flush_tlb_mm(struct mm_struct *mm)
         if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
                 smp_on_other_tlbs(flush_tlb_mm_ipi, mm);
         } else {
-                cpumask_t mask = cpu_online_map;
                 unsigned int cpu;
 
-                cpu_clear(smp_processor_id(), mask);
-                for_each_cpu_mask(cpu, mask)
-                        if (cpu_context(cpu, mm))
+                for_each_online_cpu(cpu) {
+                        if (cpu != smp_processor_id() && cpu_context(cpu, mm))
                                 cpu_context(cpu, mm) = 0;
+                }
         }
         local_flush_tlb_mm(mm);
 
@@ -360,13 +359,12 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
 
                 smp_on_other_tlbs(flush_tlb_range_ipi, &fd);
         } else {
-                cpumask_t mask = cpu_online_map;
                 unsigned int cpu;
 
-                cpu_clear(smp_processor_id(), mask);
-                for_each_cpu_mask(cpu, mask)
-                        if (cpu_context(cpu, mm))
+                for_each_online_cpu(cpu) {
+                        if (cpu != smp_processor_id() && cpu_context(cpu, mm))
                                 cpu_context(cpu, mm) = 0;
+                }
         }
         local_flush_tlb_range(vma, start, end);
         preempt_enable();
@@ -407,13 +405,12 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 
                 smp_on_other_tlbs(flush_tlb_page_ipi, &fd);
         } else {
-                cpumask_t mask = cpu_online_map;
                 unsigned int cpu;
 
-                cpu_clear(smp_processor_id(), mask);
-                for_each_cpu_mask(cpu, mask)
-                        if (cpu_context(cpu, vma->vm_mm))
+                for_each_online_cpu(cpu) {
+                        if (cpu != smp_processor_id() && cpu_context(cpu, vma->vm_mm))
                                 cpu_context(cpu, vma->vm_mm) = 0;
+                }
         }
         local_flush_tlb_page(vma, page);
         preempt_enable();
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index c4f75bbc0bd6..f5dd38f1d015 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -291,7 +291,7 @@ static void smtc_configure_tlb(void)
  * possibly leave some TCs/VPEs as "slave" processors.
  *
  * Use c0_MVPConf0 to find out how many TCs are available, setting up
- * cpu_possible_map and the logical/physical mappings.
+ * cpu_possible_mask and the logical/physical mappings.
  */
 
 int __init smtc_build_cpu_map(int start_cpu_slot)
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c
index 1f9ca07f53c8..47037ec5589b 100644
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
@@ -80,9 +80,9 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma)
         if (vma)
                 mask = *mm_cpumask(vma->vm_mm);
         else
-                mask = cpu_online_map;
-        cpu_clear(cpu, mask);
-        for_each_cpu_mask(cpu, mask)
+                mask = *cpu_online_mask;
+        cpumask_clear_cpu(cpu, &mask);
+        for_each_cpu(cpu, &mask)
                 octeon_send_ipi_single(cpu, SMP_ICACHE_FLUSH);
 
         preempt_enable();
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 46084912e588..3fab2046c8a4 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -98,7 +98,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
 EXPORT_SYMBOL(dma_alloc_noncoherent);
 
 static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
-        dma_addr_t * dma_handle, gfp_t gfp)
+        dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)
 {
         void *ret;
 
@@ -132,7 +132,7 @@ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
 EXPORT_SYMBOL(dma_free_noncoherent);
 
 static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
-        dma_addr_t dma_handle)
+        dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
         unsigned long addr = (unsigned long) vaddr;
         int order = get_order(size);
@@ -323,8 +323,8 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 EXPORT_SYMBOL(dma_cache_sync);
 
 static struct dma_map_ops mips_default_dma_map_ops = {
-        .alloc_coherent = mips_dma_alloc_coherent,
-        .free_coherent = mips_dma_free_coherent,
+        .alloc = mips_dma_alloc_coherent,
+        .free = mips_dma_free_coherent,
         .map_page = mips_dma_map_page,
         .unmap_page = mips_dma_unmap_page,
         .map_sg = mips_dma_map_sg,
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index db17f49886c2..fab316de57e9 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -165,7 +165,7 @@ void __init nlm_smp_setup(void)
         cpu_set(boot_cpu, phys_cpu_present_map);
         __cpu_number_map[boot_cpu] = 0;
         __cpu_logical_map[0] = boot_cpu;
-        cpu_set(0, cpu_possible_map);
+        set_cpu_possible(0, true);
 
         num_cpus = 1;
         for (i = 0; i < NR_CPUS; i++) {
@@ -177,14 +177,14 @@ void __init nlm_smp_setup(void)
                         cpu_set(i, phys_cpu_present_map);
                         __cpu_number_map[i] = num_cpus;
                         __cpu_logical_map[num_cpus] = i;
-                        cpu_set(num_cpus, cpu_possible_map);
+                        set_cpu_possible(num_cpus, true);
                         ++num_cpus;
                 }
         }
 
         pr_info("Phys CPU present map: %lx, possible map %lx\n",
                 (unsigned long)phys_cpu_present_map.bits[0],
-                (unsigned long)cpu_possible_map.bits[0]);
+                (unsigned long)cpumask_bits(cpu_possible_mask)[0]);
 
         pr_info("Detected %i Slave CPU(s)\n", num_cpus);
         nlm_set_nmi_handler(nlm_boot_secondary_cpus);
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 2608752898c0..b71fae231049 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -146,7 +146,7 @@ static void __cpuinit yos_boot_secondary(int cpu, struct task_struct *idle)
 }
 
 /*
- * Detect available CPUs, populate cpu_possible_map before smp_init
+ * Detect available CPUs, populate cpu_possible_mask before smp_init
  *
  * We don't want to start the secondary CPU yet nor do we have a nice probing
  * feature in PMON so we just assume presence of the secondary core.
@@ -155,10 +155,10 @@ static void __init yos_smp_setup(void)
 {
         int i;
 
-        cpus_clear(cpu_possible_map);
+        init_cpu_possible(cpu_none_mask);
 
         for (i = 0; i < 2; i++) {
-                cpu_set(i, cpu_possible_map);
+                set_cpu_possible(i, true);
                 __cpu_number_map[i]     = i;
                 __cpu_logical_map[i]    = i;
         }
@@ -169,7 +169,7 @@ static void __init yos_prepare_cpus(unsigned int max_cpus)
         /*
          * Be paranoid.  Enable the IPI only if we're really about to go SMP.
          */
-        if (cpus_weight(cpu_possible_map))
+        if (num_possible_cpus())
                 set_c0_status(STATUSF_IP5);
 }
 
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index c6851df9ab74..735b43bf8f82 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -76,7 +76,7 @@ static int do_cpumask(cnodeid_t cnode, nasid_t nasid, int highest)
                         /* Only let it join in if it's marked enabled */
                         if ((acpu->cpu_info.flags & KLINFO_ENABLE) &&
                             (tot_cpus_found != NR_CPUS)) {
-                                cpu_set(cpuid, cpu_possible_map);
+                                set_cpu_possible(cpuid, true);
                                 alloc_cpupda(cpuid, tot_cpus_found);
                                 cpus_found++;
                                 tot_cpus_found++;
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index d667875be564..de88e22694a0 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -138,7 +138,7 @@ static void __cpuinit bcm1480_boot_secondary(int cpu, struct task_struct *idle)
 
 /*
  * Use CFE to find out how many CPUs are available, setting up
- * cpu_possible_map and the logical/physical mappings.
+ * cpu_possible_mask and the logical/physical mappings.
  * XXXKW will the boot CPU ever not be physical 0?
  *
  * Common setup before any secondaries are started
@@ -147,14 +147,13 @@ static void __init bcm1480_smp_setup(void)
 {
         int i, num;
 
-        cpus_clear(cpu_possible_map);
-        cpu_set(0, cpu_possible_map);
+        init_cpu_possible(cpumask_of(0));
         __cpu_number_map[0] = 0;
         __cpu_logical_map[0] = 0;
 
         for (i = 1, num = 0; i < NR_CPUS; i++) {
                 if (cfe_cpu_stop(i) == 0) {
-                        cpu_set(i, cpu_possible_map);
+                        set_cpu_possible(i, true);
                         __cpu_number_map[i] = ++num;
                         __cpu_logical_map[num] = i;
                 }
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index 38e7f6bd7922..285cfef4ebc0 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -126,7 +126,7 @@ static void __cpuinit sb1250_boot_secondary(int cpu, struct task_struct *idle)
 
 /*
  * Use CFE to find out how many CPUs are available, setting up
- * cpu_possible_map and the logical/physical mappings.
+ * cpu_possible_mask and the logical/physical mappings.
  * XXXKW will the boot CPU ever not be physical 0?
  *
  * Common setup before any secondaries are started
@@ -135,14 +135,13 @@ static void __init sb1250_smp_setup(void)
 {
         int i, num;
 
-        cpus_clear(cpu_possible_map);
-        cpu_set(0, cpu_possible_map);
+        init_cpu_possible(cpumask_of(0));
         __cpu_number_map[0] = 0;
         __cpu_logical_map[0] = 0;
 
         for (i = 1, num = 0; i < NR_CPUS; i++) {
                 if (cfe_cpu_stop(i) == 0) {
-                        cpu_set(i, cpu_possible_map);
+                        set_cpu_possible(i, true);
                         __cpu_number_map[i] = ++num;
                         __cpu_logical_map[num] = i;
                 }