Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-16 18:26:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sparc64: Defer cpu_data() setup until end of per-cpu data initialization.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-05-26 22:37:25 -07:00
parent a2094502dc
commit b696fdc259
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sparc/kernel/ds.c
View File

@ -544,6 +544,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp,
resp_len, ncpus, mask, resp_len, ncpus, mask,
DR_CPU_STAT_CONFIGURED); DR_CPU_STAT_CONFIGURED);
mdesc_populate_present_mask(mask);
mdesc_fill_in_cpu_data(mask); mdesc_fill_in_cpu_data(mask);
for_each_cpu_mask(cpu, *mask) { for_each_cpu_mask(cpu, *mask) {

1
arch/sparc/kernel/mdesc.c
View File

@ -861,7 +861,6 @@ void __cpuinit mdesc_fill_in_cpu_data(cpumask_t *mask)
{ {
struct mdesc_handle *hp; struct mdesc_handle *hp;
mdesc_populate_present_mask(mask);
mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask); mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

1
arch/sparc/kernel/prom_64.c
View File

@ -535,7 +535,6 @@ void __init of_fill_in_cpu_data(void)
if (tlb_type == hypervisor) if (tlb_type == hypervisor)
return; return;
of_populate_present_mask();
of_iterate_over_cpus(fill_in_one_cpu, 0); of_iterate_over_cpus(fill_in_one_cpu, 0);
smp_fill_in_sib_core_maps(); smp_fill_in_sib_core_maps();

4
arch/sparc/kernel/smp_64.c
View File

@ -1399,4 +1399,8 @@ void __init real_setup_per_cpu_areas(void)
/* Setup %g5 for the boot cpu. */ /* Setup %g5 for the boot cpu. */
__local_per_cpu_offset = __per_cpu_offset(smp_processor_id()); __local_per_cpu_offset = __per_cpu_offset(smp_processor_id());
of_fill_in_cpu_data();
if (tlb_type == hypervisor)
mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
} }

12
arch/sparc/mm/init_64.c
View File

@ -1799,20 +1799,16 @@ void __init paging_init(void)
if (tlb_type == hypervisor) if (tlb_type == hypervisor)
sun4v_ktsb_register(); sun4v_ktsb_register();
/* We must setup the per-cpu areas before we pull in the
* PROM and the MDESC. The code there fills in cpu and
* other information into per-cpu data structures.
*/
real_setup_per_cpu_areas();
prom_build_devicetree(); prom_build_devicetree();
of_fill_in_cpu_data(); of_populate_present_mask();
if (tlb_type == hypervisor) { if (tlb_type == hypervisor) {
sun4v_mdesc_init(); sun4v_mdesc_init();
mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR); mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
} }
real_setup_per_cpu_areas();
/* Once the OF device tree and MDESC have been setup, we know /* Once the OF device tree and MDESC have been setup, we know
* the list of possible cpus. Therefore we can allocate the * the list of possible cpus. Therefore we can allocate the
* IRQ stacks. * IRQ stacks.