2 files changed, 5 insertions, 6 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index b8869aa20dec..2b6b0d50c576 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -35,8 +35,7 @@ void __init plat_smp_setup(void)
         unsigned int cpu = 0;
         int i, num;
 
-        cpus_clear(cpu_possible_map);
-        cpu_set(cpu, cpu_possible_map);
+        init_cpu_possible(cpumask_of(cpu));
 
         __cpu_number_map[0] = 0;
         __cpu_logical_map[0] = 0;
@@ -46,7 +45,7 @@ void __init plat_smp_setup(void)
          * for the total number of cores.
          */
         for (i = 1, num = 0; i < NR_CPUS; i++) {
-                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/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 576aad3e1b1d..442d8d47a41e 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -47,7 +47,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         plat_prepare_cpus(max_cpus);
 
 #ifndef CONFIG_HOTPLUG_CPU
-        cpu_present_map = cpu_possible_map;
+        init_cpu_present(&cpu_possible_map);
 #endif
 }
 
@@ -58,8 +58,8 @@ void __devinit smp_prepare_boot_cpu(void)
         __cpu_number_map[0] = cpu;
         __cpu_logical_map[0] = cpu;
 
-        cpu_set(cpu, cpu_online_map);
-        cpu_set(cpu, cpu_possible_map);
+        set_cpu_online(cpu, true);
+        set_cpu_possible(cpu, true);
 }
 
 asmlinkage void __cpuinit start_secondary(void)