instance = 0;
        while (!cpu_find_by_instance(instance, NULL, &mid)) {
                if (mid < NR_CPUS) {
-                       cpu_set(mid, cpu_possible_map);
-                       cpu_set(mid, cpu_present_map);
+                       set_cpu_possible(mid, true);
+                       set_cpu_present(mid, true);
                }
                instance++;
        }
                printk("boot cpu id != 0, this could work but is untested\n");
 
        current_thread_info()->cpu = cpuid;
-       cpu_set(cpuid, cpu_online_map);
-       cpu_set(cpuid, cpu_possible_map);
+       set_cpu_online(cpuid, true);
+       set_cpu_possible(cpuid, true);
 }
 
 int __cpuinit __cpu_up(unsigned int cpu)
 
        spin_lock_irqsave(&sun4d_imsk_lock, flags);
        cc_set_imsk(cc_get_imsk() & ~0x4000); /* Allow PIL 14 as well */
        spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
-       cpu_set(cpuid, cpu_online_map);
+       set_cpu_online(cpuid, true);
 
 }