summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-10-31 09:22:22 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-10 22:30:20 +0000
commitac15e00b1efe705b66a36d1a6a9db7f6ed524c43 (patch)
tree203b398bbb6740f735d2a293149823a2a223740b
parent34adeda943e1fb10e8de022b834996e04241fa7d (diff)
downloadblackbird-op-linux-ac15e00b1efe705b66a36d1a6a9db7f6ed524c43.tar.gz
blackbird-op-linux-ac15e00b1efe705b66a36d1a6a9db7f6ed524c43.zip
ARM: restart: move reboot failure handing into machine_restart()
Move the failure to reboot into machine_restart() to always catch this condition, even if a platform decides to hook the restarting via arm_pm_restart(). Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/process.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 75316f0dd02a..3bda1c379776 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -114,18 +114,8 @@ void arm_machine_restart(char mode, const char *cmd)
/* Push out any further dirty data, and ensure cache is empty */
flush_cache_all();
- /*
- * Now call the architecture specific reboot code.
- */
+ /* Now call the architecture specific reboot code. */
arch_reset(mode, cmd);
-
- /*
- * Whoops - the architecture was unable to reboot.
- * Tell the user!
- */
- mdelay(1000);
- printk("Reboot failed -- System halted\n");
- while (1);
}
/*
@@ -250,7 +240,15 @@ void machine_power_off(void)
void machine_restart(char *cmd)
{
machine_shutdown();
+
arm_pm_restart(reboot_mode, cmd);
+
+ /* Give a grace period for failure to restart of 1s */
+ mdelay(1000);
+
+ /* Whoops - the platform was unable to reboot. Tell the user! */
+ printk("Reboot failed -- System halted\n");
+ while (1);
}
void __show_regs(struct pt_regs *regs)
OpenPOWER on IntegriCloud