Merge "arm64: Fix deadlock scenario with smp_send_stop()" (71c075a1) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/kernel/process.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ void machine_shutdown(void)
		*/
		void machine_halt(void)
		{
		local_irq_disable();
		smp_send_stop();
		while (1);
		}
		@@ -140,6 +141,7 @@ void machine_halt(void)
		*/
		void machine_power_off(void)
		{
		local_irq_disable();
		smp_send_stop();
		if (pm_power_off)
		pm_power_off();
		@@ -158,10 +160,9 @@ void machine_power_off(void)
		*/
		void machine_restart(char *cmd)
		{
		smp_send_stop();

		/* Disable interrupts first */
		local_irq_disable();
		smp_send_stop();

		/* Now call the architecture specific reboot code. */
		if (arm_pm_restart)