Blackfin: convert old cpumask API to new one

old cpu_xxx() APIs is planned to removed later. then, converted.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c
index 401eb1d8e3b4..679d0db35256 100644
--- a/arch/blackfin/kernel/nmi.c
+++ b/arch/blackfin/kernel/nmi.c
@@ -145,16 +145,16 @@ int check_nmi_wdt_touched(void)
 {
         unsigned int this_cpu = smp_processor_id();
         unsigned int cpu;
+        cpumask_t mask;
 
-        cpumask_t mask = cpu_online_map;
-
+        cpumask_copy(&mask, cpu_online_mask);
         if (!atomic_read(&nmi_touched[this_cpu]))
                 return 0;
 
         atomic_set(&nmi_touched[this_cpu], 0);
 
-        cpu_clear(this_cpu, mask);
-        for_each_cpu_mask(cpu, mask) {
+        cpumask_clear_cpu(this_cpu, &mask);
+        for_each_cpu(cpu, &mask) {
                 invalidate_dcache_range((unsigned long)(&nmi_touched[cpu]),
                                 (unsigned long)(&nmi_touched[cpu]));
                 if (!atomic_read(&nmi_touched[cpu]))
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 2f48f03c634e..536bd9d7e0cf 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -1324,7 +1324,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
         if (*pos == 0)
-                *pos = first_cpu(cpu_online_map);
+                *pos = cpumask_first(cpu_online_mask);
         if (*pos >= num_online_cpus())
                 return NULL;
 
@@ -1333,7 +1333,7 @@ static void *c_start(struct seq_file *m, loff_t *pos)
 
 static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 {
-        *pos = next_cpu(*pos, cpu_online_map);
+        *pos = cpumask_next(*pos, cpu_online_mask);
 
         return c_start(m, pos);
 }