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

Commit 2b8708c3 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: smp: Update the topology masks before calling CPU_STARTING notifiers" into msm-4.8

parents 2734d980 7c04ad82

arch/arm/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -388,12 +388,12 @@ asmlinkage void secondary_start_kernel(void) 
	if (smp_ops.smp_secondary_init)

		smp_ops.smp_secondary_init(cpu);



	smp_store_cpu_info(cpu);



	notify_cpu_starting(cpu);



	calibrate_delay();



	smp_store_cpu_info(cpu);



	/*

	 * OK, now it's safe to let the boot CPU continue.  Wait for

	 * the CPU migration code to notice that the CPU is online

arch/arm64/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -252,10 +252,10 @@ asmlinkage void secondary_start_kernel(void) 
	/*

	 * Enable GIC and timers.

	 */

	notify_cpu_starting(cpu);



	smp_store_cpu_info(cpu);



	notify_cpu_starting(cpu);



	/*

	 * OK, now it's safe to let the boot CPU continue.  Wait for

	 * the CPU migration code to notice that the CPU is online