Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9a2101 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: Update cpu_possible_mask according to CPU definition in DT"

parents 54a80aa3 fb586891

arch/arm/kernel/devtree.c

+8 −4
Original line number Diff line number Diff line
@@ -174,10 +174,14 @@ void __init arm_dt_init_cpu_maps(void) 
	 * a reg property, the DT CPU list can be considered valid and the

	 * logical map created in smp_setup_processor_id() can be overridden

	 */

	for (i = 0; i < cpuidx; i++) {

	for (i = 0; i < nr_cpu_ids; i++) {

		if (i < cpuidx) {

			set_cpu_possible(i, true);

			cpu_logical_map(i) = tmp_map[i];

			pr_debug("cpu logical map 0x%x\n", cpu_logical_map(i));

		} else {

			set_cpu_possible(i, false);

		}

	}

}

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -804,11 +804,11 @@ void __init setup_arch(char **cmdline_p) 


	unflatten_device_tree();



	arm_dt_init_cpu_maps();

#ifdef CONFIG_SMP

	if (is_smp()) {

		smp_set_ops(mdesc->smp);

		smp_init_cpus();

		arm_dt_init_cpu_maps();

	}

#endif