Blackfin: don't touch cpu_possible_map and cpu_present_map directly

We plan to remove cpu_possible_map and cpu_present_map later and we
have proper init_cpu_possible() and init_cpu_present() APIs.

Therefore this patch rewrites platform_init_cpus and platform_prepare_cpus
by their APIs.

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

1 files changed, 10 insertions, 4 deletions

diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c
index 390accf17ebc..85abd8be1343 100644
--- a/arch/blackfin/mach-bf561/smp.c
+++ b/arch/blackfin/mach-bf561/smp.c
@@ -24,17 +24,23 @@ static DEFINE_SPINLOCK(boot_lock);
 
 void __init platform_init_cpus(void)
 {
-        cpu_set(0, cpu_possible_map); /* CoreA */
-        cpu_set(1, cpu_possible_map); /* CoreB */
+        struct cpumask mask;
+
+        cpumask_set_cpu(0, &mask); /* CoreA */
+        cpumask_set_cpu(1, &mask); /* CoreB */
+        init_cpu_possible(&mask);
 }
 
 void __init platform_prepare_cpus(unsigned int max_cpus)
 {
+        struct cpumask mask;
+
         bfin_relocate_coreb_l1_mem();
 
         /* Both cores ought to be present on a bf561! */
-        cpu_set(0, cpu_present_map); /* CoreA */
-        cpu_set(1, cpu_present_map); /* CoreB */
+        cpumask_set_cpu(0, &mask); /* CoreA */
+        cpumask_set_cpu(1, &mask); /* CoreB */
+        init_cpu_present(&mask);
 }
 
 int __init setup_profiling_timer(unsigned int multiplier) /* not supported */