git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
setup-common.c
diff --git
a/arch/powerpc/kernel/setup-common.c
b/arch/powerpc/kernel/setup-common.c
index
9d4882a
..
21f30cb
100644
(file)
--- a/
arch/powerpc/kernel/setup-common.c
+++ b/
arch/powerpc/kernel/setup-common.c
@@
-509,6
+509,9
@@
void __init smp_setup_cpu_maps(void)
*/
cpu_init_thread_core_maps(nthreads);
+ /* Now that possible cpus are set, set nr_cpu_ids for later use */
+ nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
+
free_unused_pacas();
}
#endif /* CONFIG_SMP */