Merge "arm64: smp: Jump back to secondary start kernel for onlined CPUs" (1d91f219) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/kernel/smp.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ void __cpu_die(unsigned int cpu)
		* of the other hotplug-cpu capable cores, so presumably coming
		* out of idle fixes this.
		*/
		void cpu_die(void)
		void __ref cpu_die(void)
		{
		unsigned int cpu = smp_processor_id();

		@@ -262,7 +262,16 @@ void cpu_die(void)
		*/
		cpu_ops[cpu]->cpu_die(cpu);

		BUG();
		/*
		* Do not return to the idle loop - jump back to the secondary
		* cpu initialisation. There's some initialisation which needs
		* to be repeated to undo the effects of taking the CPU offline.
		*/

		asm volatile("mov sp, %0\n"
		"mov x29, #0\n"
		"b secondary_start_kernel"
		: : "r" (task_stack_page(current) + THREAD_START_SP));
		}
		#endif