Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (39 commits) cpumask: Move deprecated functions to end of header. cpumask: remove unused deprecated functions, avoid accusations of insanity cpumask: use new-style cpumask ops in mm/quicklist. cpumask: use mm_cpumask() wrapper: x86 cpumask: use mm_cpumask() wrapper: um cpumask: use mm_cpumask() wrapper: mips cpumask: use mm_cpumask() wrapper: mn10300 cpumask: use mm_cpumask() wrapper: m32r cpumask: use mm_cpumask() wrapper: arm cpumask: Use accessors for cpu_*_mask: um cpumask: Use accessors for cpu_*_mask: powerpc cpumask: Use accessors for cpu_*_mask: mips cpumask: Use accessors for cpu_*_mask: m32r cpumask: remove arch_send_call_function_ipi cpumask: arch_send_call_function_ipi_mask: s390 cpumask: arch_send_call_function_ipi_mask: powerpc cpumask: arch_send_call_function_ipi_mask: mips cpumask: arch_send_call_function_ipi_mask: m32r cpumask: arch_send_call_function_ipi_mask: alpha cpumask: remove obsolete topology_core_siblings and topology_thread_siblings: ia64 ...
This commit is contained in:
@@ -431,9 +431,9 @@ void __init smp_setup_cpu_maps(void)
|
||||
for (j = 0; j < nthreads && cpu < NR_CPUS; j++) {
|
||||
DBG(" thread %d -> cpu %d (hard id %d)\n",
|
||||
j, cpu, intserv[j]);
|
||||
cpu_set(cpu, cpu_present_map);
|
||||
set_cpu_present(cpu, true);
|
||||
set_hard_smp_processor_id(cpu, intserv[j]);
|
||||
cpu_set(cpu, cpu_possible_map);
|
||||
set_cpu_possible(cpu, true);
|
||||
cpu++;
|
||||
}
|
||||
}
|
||||
@@ -479,7 +479,7 @@ void __init smp_setup_cpu_maps(void)
|
||||
maxcpus);
|
||||
|
||||
for (cpu = 0; cpu < maxcpus; cpu++)
|
||||
cpu_set(cpu, cpu_possible_map);
|
||||
set_cpu_possible(cpu, true);
|
||||
out:
|
||||
of_node_put(dn);
|
||||
}
|
||||
|
Reference in New Issue
Block a user