Commit 98bd8b96 authored Jul 13, 2012 by Shawn Guo Committed by Russell King Jul 31, 2012

ARM: 7466/1: disable interrupt before spinning endlessly



The CPU will endlessly spin at the end of machine_halt and
machine_restart calls.  However, this will lead to a soft lockup
warning after about 20 seconds, if CONFIG_LOCKUP_DETECTOR is enabled,
as system timer is still alive.

Disable interrupt before going to spin endlessly, so that the lockup
warning will never be seen.

Cc: <stable@vger.kernel.org>
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent a5d5f7da

arch/arm/kernel/process.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -247,6 +247,7 @@ void machine_shutdown(void)
	void machine_halt(void)		void machine_halt(void)
	{		{
	machine_shutdown();		machine_shutdown();
			local_irq_disable();
	while (1);		while (1);
	}		}

	@@ -268,6 +269,7 @@ void machine_restart(char *cmd)

	/* Whoops - the platform was unable to reboot. Tell the user! */		/* Whoops - the platform was unable to reboot. Tell the user! */
	printk("Reboot failed -- System halted\n");		printk("Reboot failed -- System halted\n");
			local_irq_disable();
	while (1);		while (1);
	}		}