Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b696fdc259f0d94348a9327bed352fac44d4883d

Authored by David S. Miller
1 parent a2094502dc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 9 additions and 10 deletions Side-by-side Diff

arch/sparc/kernel/ds.c
Diff comments   View file @ b696fdc
... ... @@ -544,6 +544,7 @@
544 544 resp_len, ncpus, mask,
545 545 DR_CPU_STAT_CONFIGURED);
546 546  
  547 + mdesc_populate_present_mask(mask);
547 548 mdesc_fill_in_cpu_data(mask);
548 549  
549 550 for_each_cpu_mask(cpu, *mask) {
arch/sparc/kernel/mdesc.c
Diff comments   View file @ b696fdc
... ... @@ -861,7 +861,6 @@
861 861 {
862 862 struct mdesc_handle *hp;
863 863  
864   - mdesc_populate_present_mask(mask);
865 864 mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask);
866 865  
867 866 #ifdef CONFIG_SMP
arch/sparc/kernel/prom_64.c
Diff comments   View file @ b696fdc
... ... @@ -535,7 +535,6 @@
535 535 if (tlb_type == hypervisor)
536 536 return;
537 537  
538   - of_populate_present_mask();
539 538 of_iterate_over_cpus(fill_in_one_cpu, 0);
540 539  
541 540 smp_fill_in_sib_core_maps();
arch/sparc/kernel/smp_64.c
Diff comments   View file @ b696fdc
... ... @@ -1399,5 +1399,9 @@
1399 1399  
1400 1400 /* Setup %g5 for the boot cpu. */
1401 1401 __local_per_cpu_offset = __per_cpu_offset(smp_processor_id());
  1402 +
  1403 + of_fill_in_cpu_data();
  1404 + if (tlb_type == hypervisor)
  1405 + mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
1402 1406 }
arch/sparc/mm/init_64.c
Diff comments   View file @ b696fdc
... ... @@ -1799,19 +1799,15 @@
1799 1799 if (tlb_type == hypervisor)
1800 1800 sun4v_ktsb_register();
1801 1801  
1802   - /* We must setup the per-cpu areas before we pull in the
1803   - * PROM and the MDESC. The code there fills in cpu and
1804   - * other information into per-cpu data structures.
1805   - */
1806   - real_setup_per_cpu_areas();
1807   -
1808 1802 prom_build_devicetree();
1809   - of_fill_in_cpu_data();
  1803 + of_populate_present_mask();
1810 1804  
1811 1805 if (tlb_type == hypervisor) {
1812 1806 sun4v_mdesc_init();
1813   - mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
  1807 + mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
1814 1808 }
  1809 +
  1810 + real_setup_per_cpu_areas();
1815 1811  
1816 1812 /* Once the OF device tree and MDESC have been setup, we know
1817 1813 * the list of possible cpus. Therefore we can allocate the