diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-07-13 08:19:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 08:10:05 -0700 |
| commit | 05aa0d1bc94e2809ec0ccb4be20860784e4640b1 (patch) | |
| tree | a5793c18831793b3a880167ba8db26564bae9be0 | |
| parent | ce6f0ff8d1031931df7031a88f4085e5f196a854 (diff) | |
| download | linux-3.10-05aa0d1bc94e2809ec0ccb4be20860784e4640b1.tar.gz linux-3.10-05aa0d1bc94e2809ec0ccb4be20860784e4640b1.tar.bz2 linux-3.10-05aa0d1bc94e2809ec0ccb4be20860784e4640b1.zip | |
ARM: 7466/1: disable interrupt before spinning endlessly
commit 98bd8b96b26db3399a48202318dca4aaa2515355 upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 2b7b017a20c..48f36246a5d 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -267,6 +267,7 @@ void machine_shutdown(void) void machine_halt(void) { machine_shutdown(); + local_irq_disable(); while (1); } @@ -288,6 +289,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); } |