[PATCH v3 4/6] arm: Support reboot through watchdog subsystem
From: linux@roeck-us.net (Guenter Roeck)
Date: 2014-05-15 20:38:55
Also in:
linux-watchdog, lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
The watchdog subsystem provides an API to perform a system reboot. Use it. With this change, the arm_pm_restart callback is now optional, so check if it is set before calling it. Tested-by: Jonas Jensen <redacted> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- v3: Drop reboot mode and cmd string parameters from API v2: No change arch/arm/kernel/process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 81ef686..4bfbedc 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c@@ -32,6 +32,7 @@ #include <linux/hw_breakpoint.h> #include <linux/leds.h> #include <linux/reboot.h> +#include <linux/watchdog.h> #include <asm/cacheflush.h> #include <asm/idmap.h>
@@ -230,7 +231,10 @@ void machine_restart(char *cmd) local_irq_disable(); smp_send_stop(); - arm_pm_restart(reboot_mode, cmd); + if (arm_pm_restart) + arm_pm_restart(reboot_mode, cmd); + + watchdog_do_reboot(); /* Give a grace period for failure to restart of 1s */ mdelay(1000);
--
1.9.1