iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Set nr_cpu_ids early and use it to free PACAs

Browse Source 
Without this, "holes" in the CPU numbering can cause us to
free too many PACAs

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Ryan Grimm 2011-03-31 19:33:02 +00:00 committed by Benjamin Herrenschmidt
parent f86d6b9b36
commit c1854e0072
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/paca.c
View File

@ -203,7 +203,7 @@ void __init free_unused_pacas(void)
{ {
int new_size; int new_size;
new_size = PAGE_ALIGN(sizeof(struct paca_struct) * num_possible_cpus()); new_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);
if (new_size >= paca_size) if (new_size >= paca_size)
return; return;

3
arch/powerpc/kernel/setup-common.c
View File

@ -509,6 +509,9 @@ void __init smp_setup_cpu_maps(void)
*/ */
cpu_init_thread_core_maps(nthreads); 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(); free_unused_pacas();
} }
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */