while (!cpu_find_by_instance(ncpus_probed, NULL, NULL))
                ncpus_probed++;
 
-       for_each_cpu(i) {
+       for_each_possible_cpu(i) {
                struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
                if (p) {
                        register_cpu(p, i, NULL);
 
                return -EINVAL;
 
        spin_lock_irqsave(&prof_setup_lock, flags);
-       for_each_cpu(i)
+       for_each_possible_cpu(i)
                prof_multiplier(i) = multiplier;
        current_tick_offset = (timer_tick_offset / multiplier);
        spin_unlock_irqrestore(&prof_setup_lock, flags);
                }
        }
 
-       for_each_cpu(i) {
+       for_each_possible_cpu(i) {
                if (tlb_type == hypervisor) {
                        int j;
 
                        /* XXX get this mapping from machine description */
-                       for_each_cpu(j) {
+                       for_each_possible_cpu(j) {
                                if ((j >> 2) == (i >> 2))
                                        cpu_set(j, cpu_sibling_map[i]);
                        }
 
 #define percpu_modcopy(pcpudst, src, size)                     \
 do {                                                           \
        unsigned int __i;                                       \
-       for_each_cpu(__i)                                       \
+       for_each_possible_cpu(__i)                              \
                memcpy((pcpudst)+__per_cpu_offset(__i),         \
                       (src), (size));                          \
 } while (0)