summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-07-13 07:19:34 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-31 09:30:31 (GMT)
commit98bd8b96b26db3399a48202318dca4aaa2515355 (patch)
tree1dcb9a580130d0653b4d9b66bbf78b2fe30d1726 /arch/arm/kernel
parenta5d5f7daa744b34477c4a12728bde0a1694a1707 (diff)
downloadlinux-98bd8b96b26db3399a48202318dca4aaa2515355.tar.xz
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>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/process.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 19c95ea..693b744 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -247,6 +247,7 @@ void machine_shutdown(void)
void machine_halt(void)
{
machine_shutdown();
+ local_irq_disable();
while (1);
}
@@ -268,6 +269,7 @@ void machine_restart(char *cmd)
/* Whoops - the platform was unable to reboot. Tell the user! */
printk("Reboot failed -- System halted\n");
+ local_irq_disable();
while (1);
}