Merge "arch_topology: Update cpu core sibling mask at topology initialization" (4eec16d7) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/kernel/topology.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -347,6 +347,9 @@ void __init init_cpu_topology(void)

		parse_dt_topology();

		for_each_possible_cpu(cpu)
		update_siblings_masks(cpu);

		/* Set scheduler topology descriptor */
		set_sched_topology(arm_topology);
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -349,14 +349,19 @@ static void __init reset_cpu_topology(void)

		void __init init_cpu_topology(void)
		{
		int cpu;

		reset_cpu_topology();

		/*
		* Discard anything that was parsed if we hit an error so we
		* don't use partial information.
		*/
		if (of_have_populated_dt() && parse_dt_topology())
		if (of_have_populated_dt() && parse_dt_topology()) {
		reset_cpu_topology();
		else
		} else {
		set_sched_topology(arm64_topology);
		for_each_possible_cpu(cpu)
		update_siblings_masks(cpu);
		}
		}